瀏覽代碼

CMake: audiotraits and ffmpeg are MODULE, not SHARED

This is important as it forces the lib prefix on Windows,
and omits creating an import .lib when building shared.
Sam Edwards 6 年之前
父節點
當前提交
73ed31b935
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      panda/src/audiotraits/CMakeLists.txt
  2. 1 1
      panda/src/ffmpeg/CMakeLists.txt

+ 2 - 2
panda/src/audiotraits/CMakeLists.txt

@@ -17,7 +17,7 @@ if(HAVE_FMODEX)
   )
 
   composite_sources(p3fmod_audio P3FMOD_SOURCES)
-  add_library(p3fmod_audio ${P3FMOD_HEADERS} ${P3FMOD_SOURCES})
+  add_library(p3fmod_audio ${MODULE_TYPE} ${P3FMOD_HEADERS} ${P3FMOD_SOURCES})
   set_target_properties(p3fmod_audio PROPERTIES DEFINE_SYMBOL BUILDING_FMOD_AUDIO)
   target_link_libraries(p3fmod_audio panda PKG::FMODEX)
 
@@ -45,7 +45,7 @@ if(HAVE_OPENAL)
 
 
   composite_sources(p3openal_audio P3OPENAL_SOURCES)
-  add_library(p3openal_audio ${P3OPENAL_HEADERS} ${P3OPENAL_SOURCES})
+  add_library(p3openal_audio ${MODULE_TYPE} ${P3OPENAL_HEADERS} ${P3OPENAL_SOURCES})
   set_target_properties(p3openal_audio PROPERTIES DEFINE_SYMBOL BUILDING_OPENAL_AUDIO)
   target_link_libraries(p3openal_audio panda PKG::OPENAL)
 

+ 1 - 1
panda/src/ffmpeg/CMakeLists.txt

@@ -21,7 +21,7 @@ set(P3FFMPEG_SOURCES
 )
 
 composite_sources(p3ffmpeg P3FFMPEG_SOURCES)
-add_library(p3ffmpeg ${P3FFMPEG_HEADERS} ${P3FFMPEG_SOURCES})
+add_library(p3ffmpeg ${MODULE_TYPE} ${P3FFMPEG_HEADERS} ${P3FFMPEG_SOURCES})
 set_target_properties(p3ffmpeg PROPERTIES DEFINE_SYMBOL BUILDING_FFMPEG)
 target_link_libraries(p3ffmpeg panda
   PKG::FFMPEG PKG::SWSCALE PKG::SWRESAMPLE)