Allow ff7music and vgmstream plugins to be build

And place resulting DLLs inside the bin output directory

Author: julianxhokaxhiu

CMakeLists.txt

@@ -21,6 +21,7 @@ if (SUPERBUILD)
 		zlib
 		libpng
 		ffmpeg
+		vgmstream
 	)
 	ExternalProject_Add_Step(
 		ff7_opengl

cmake/FindVGMSTREAM.cmake

@@ -0,0 +1,36 @@
+include(FindPackageHandleStandardArgs)
+
+if (NOT VGMSTREAM_FOUND)
+	find_package(FFMPEG REQUIRED)
+
+	find_library(
+		VGMSTREAM_LIBRARY
+		libvgmstream
+		PATH_SUFFIXES
+		lib
+	)
+
+	find_path(
+		VGMSTREAM_INCLUDE_DIR
+		vgmstream.h
+		PATH_SUFFIXES
+		include
+	)
+
+	add_library(VGMSTREAM::VGMSTREAM STATIC IMPORTED)
+
+	set_target_properties(
+		VGMSTREAM::VGMSTREAM
+		PROPERTIES
+		IMPORTED_LOCATION
+		"${VGMSTREAM_LIBRARY}"
+		INTERFACE_INCLUDE_DIRECTORIES
+		"${VGMSTREAM_INCLUDE_DIR}"
+		INTERFACE_LINK_LIBRARIES
+        FFMPEG::SWResample
+	    FFMPEG::AVCodec
+	    FFMPEG::AVFormat
+	)
+
+	find_package_handle_standard_args(VGMSTREAM DEFAULT_MSG VGMSTREAM_LIBRARY VGMSTREAM_INCLUDE_DIR)
+endif()

src/CMakeLists.txt

@@ -2,15 +2,13 @@ find_package(GLEW REQUIRED)
 find_package(ZLib REQUIRED)
 find_package(PNG REQUIRED)
 find_package(FFMPEG REQUIRED)
+find_package(VGMSTREAM REQUIRED)
 
 string(TOUPPER ${CMAKE_BUILD_TYPE} RELEASE_TYPE)
 add_compile_definitions(${RELEASE_TYPE})
 
-add_library(ff7_opengl SHARED cfg.h cfg.c common.h common.c common_imports.h compile_cfg.h
-	crashdump.c crashdump.h ctx.h ctx.c externals_102_de.h externals_102_fr.h externals_102_sp.h externals_102_us.h
-	fake_dd.h fake_dd.c ff7.h ff7_data.h ff7_opengl.c ff8.h ff8_data.h ff8_opengl.c gl.h globals.h log.c log.h
-	macro.h matrix.c matrix.h movies.c movies.h music.c music.h patch.c patch.h pngcustom.c pngcustom.h saveload.c saveload.h types.h
-)
+file(GLOB source_files "*.h" "*.c")
+add_library(ff7_opengl SHARED ${source_files})
 add_subdirectory(3rdparty)
 add_subdirectory(ff7)
 add_subdirectory(gl)
@@ -33,5 +31,25 @@ target_link_libraries(ffmpeg_movies
 )
 target_compile_definitions(ffmpeg_movies PRIVATE -D_CRT_SECURE_NO_WARNINGS=1)
 
+add_library(vgmstream_music SHARED)
+target_include_directories(vgmstream_music PRIVATE "${CMAKE_BINARY_DIR}/vendor/include")
+add_subdirectory(vgmstream_music)
+target_link_libraries(vgmstream_music
+    VGMSTREAM::VGMSTREAM
+	FFMPEG::AVUtil
+	FFMPEG::SWResample
+	FFMPEG::AVCodec
+	FFMPEG::AVFormat
+	FFMPEG::SWScale
+)
+target_compile_definitions(vgmstream_music PRIVATE -D_CRT_SECURE_NO_WARNINGS=1)
+
+add_library(ff7music SHARED)
+target_include_directories(ff7music PRIVATE "${CMAKE_BINARY_DIR}/vendor/include")
+add_subdirectory(ff7music)
+target_compile_definitions(ff7music PRIVATE -D_CRT_SECURE_NO_WARNINGS=1)
+
 install(TARGETS ffmpeg_movies RUNTIME DESTINATION bin)
+install(TARGETS vgmstream_music RUNTIME DESTINATION bin)
+install(TARGETS ff7music RUNTIME DESTINATION bin)
 install(FILES "${FFMPEG_AVUTIL_DLL}" "${FFMPEG_SWRESAMPLE_DLL}" "${FFMPEG_AVCODEC_DLL}" "${FFMPEG_AVFORMAT_DLL}" "${FFMPEG_SWSCALE_DLL}" DESTINATION bin)

src/ff7music/CMakeLists.txt

@@ -0,0 +1,5 @@
+target_sources(ff7music
+	PRIVATE
+		${CMAKE_CURRENT_LIST_DIR}/music.c
+		${CMAKE_CURRENT_LIST_DIR}/types.h
+)

src/vgmstream_music/CMakeLists.txt

@@ -0,0 +1,5 @@
+target_sources(vgmstream_music
+	PRIVATE
+		${CMAKE_CURRENT_LIST_DIR}/music.c
+		${CMAKE_CURRENT_LIST_DIR}/types.h
+)

third_party/CMakeLists.txt

@@ -2,3 +2,4 @@ add_subdirectory(glew)
 add_subdirectory(zlib)
 add_subdirectory(libpng)
 add_subdirectory(ffmpeg)
+add_subdirectory(vgmstream)

third_party/vgmstream/CMakeLists.txt

@@ -0,0 +1,10 @@
+include(ExternalProject)
+
+ExternalProject_Add(
+    vgmstream
+    URL             "${CMAKE_SOURCE_DIR}/third_party/vgmstream/vgmstream-win32.zip"
+	INSTALL_DIR			"${CMAKE_BINARY_DIR}/vendor"
+	CONFIGURE_COMMAND	""
+	BUILD_COMMAND		""
+	INSTALL_COMMAND		"${CMAKE_COMMAND}" -E copy_directory "<SOURCE_DIR>" "<INSTALL_DIR>"
+)