actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1362 from wolfman2000/wolf-ffmpeg-mac-disabling

Browse Source 
Allow WITH_FFMPEG to work when disabled for Mac.
This commit is contained in:
Dan Guzek
2016-12-01 18:33:38 -05:00
committed by GitHub
parent a7d4919d83 8b555bfb30
commit 5e37aeaa90
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeData-arch.cmake
+9 -8
View File
@@ -125,12 +125,14 @@ list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_HPP
)
if(APPLE)
list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_SRC
"arch/MovieTexture/MovieTexture_FFMpeg.cpp"
)
list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_HPP
"arch/MovieTexture/MovieTexture_FFMpeg.h"
)
if (${HAS_FFMPEG})
list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_SRC
"arch/MovieTexture/MovieTexture_FFMpeg.cpp"
)
list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_HPP
"arch/MovieTexture/MovieTexture_FFMpeg.h"
)
endif()
elseif(MSVC)
list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_SRC
"arch/MovieTexture/MovieTexture_FFMpeg.cpp"
@@ -281,7 +283,7 @@ if(NOT APPLE)
list(APPEND SMDATA_ARCH_LIGHTS_HPP
"arch/Lights/LightsDriver_Export.h"
)
if(WIN32)
list(APPEND SMDATA_ARCH_LIGHTS_SRC
"arch/Lights/LightsDriver_Win32Parallel.cpp"
@@ -501,4 +503,3 @@ list(APPEND SMDATA_ALL_ARCH_HPP
${SMDATA_ARCH_SOUND_HPP}
${SMDATA_ARCH_THREADS_HPP}
)