TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1160 from Azaezel/alpha41/theoraThrashing

Browse source 
fix theora inclusion and macro set
This commit is contained in:
Brian Roberts 2023-12-18 19:26:45 -06:00 • committed by GitHub
commit 0b65ff2c72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/CMakeLists.txt
View file

@ -150,6 +150,12 @@ endif (TORQUE_OPENGL)
# Handle terrain # Handle terrain
torqueAddSourceDirectories("terrain") torqueAddSourceDirectories("terrain")
# Handle theora
if (TORQUE_THEORA)
torqueAddSourceDirectories("core/ogg")
torqueAddSourceDirectories("gui/theora")
endif(TORQUE_THEORA)
if (WIN32 AND TORQUE_D3D11) if (WIN32 AND TORQUE_D3D11)
torqueAddSourceDirectories("terrain/hlsl") torqueAddSourceDirectories("terrain/hlsl")
endif (WIN32 AND TORQUE_D3D11) endif (WIN32 AND TORQUE_D3D11)
@ -337,6 +343,10 @@ addDef(TORQUE_ENABLE_ASSERTS "Debug;RelWithDebInfo")
addDef(TORQUE_DEBUG_GFX_MODE "RelWithDebInfo") addDef(TORQUE_DEBUG_GFX_MODE "RelWithDebInfo")
addDef(TORQUE_OGGVORBIS) addDef(TORQUE_OGGVORBIS)
if (TORQUE_THEORA)
addDef(TORQUE_OGGTHEORA)
endif(TORQUE_THEORA)
if(NOT TORQUE_SDL) if(NOT TORQUE_SDL)
filterOut("platform/nativeDialogs/fileDialog.cpp" ) filterOut("platform/nativeDialogs/fileDialog.cpp" )
endif() endif()