TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: audiotraits and ffmpeg are MODULE, not SHARED

Browse Source 
This is important as it forces the lib prefix on Windows,
and omits creating an import .lib when building shared.
This commit is contained in:
Sam Edwards 2019-10-10 10:42:46 -06:00
parent 5961cc2ee0
commit 73ed31b935
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/audiotraits/CMakeLists.txt
View File

@ -17,7 +17,7 @@ if(HAVE_FMODEX)
) )
composite_sources(p3fmod_audio P3FMOD_SOURCES) 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) set_target_properties(p3fmod_audio PROPERTIES DEFINE_SYMBOL BUILDING_FMOD_AUDIO)
target_link_libraries(p3fmod_audio panda PKG::FMODEX) target_link_libraries(p3fmod_audio panda PKG::FMODEX)
@ -45,7 +45,7 @@ if(HAVE_OPENAL)
composite_sources(p3openal_audio P3OPENAL_SOURCES) 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) set_target_properties(p3openal_audio PROPERTIES DEFINE_SYMBOL BUILDING_OPENAL_AUDIO)
target_link_libraries(p3openal_audio panda PKG::OPENAL) target_link_libraries(p3openal_audio panda PKG::OPENAL)

2
panda/src/ffmpeg/CMakeLists.txt
View File

@ -21,7 +21,7 @@ set(P3FFMPEG_SOURCES
) )
composite_sources(p3ffmpeg 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) set_target_properties(p3ffmpeg PROPERTIES DEFINE_SYMBOL BUILDING_FFMPEG)
target_link_libraries(p3ffmpeg panda target_link_libraries(p3ffmpeg panda
PKG::FFMPEG PKG::SWSCALE PKG::SWRESAMPLE) PKG::FFMPEG PKG::SWSCALE PKG::SWRESAMPLE)