mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-19 20:24:49 +00:00
Merge pull request #1160 from Azaezel/alpha41/theoraThrashing
fix theora inclusion and macro set
This commit is contained in:
commit
0b65ff2c72
|
|
@ -150,6 +150,12 @@ endif (TORQUE_OPENGL)
|
|||
# Handle terrain
|
||||
torqueAddSourceDirectories("terrain")
|
||||
|
||||
# Handle theora
|
||||
if (TORQUE_THEORA)
|
||||
torqueAddSourceDirectories("core/ogg")
|
||||
torqueAddSourceDirectories("gui/theora")
|
||||
endif(TORQUE_THEORA)
|
||||
|
||||
if (WIN32 AND TORQUE_D3D11)
|
||||
torqueAddSourceDirectories("terrain/hlsl")
|
||||
endif (WIN32 AND TORQUE_D3D11)
|
||||
|
|
@ -337,6 +343,10 @@ addDef(TORQUE_ENABLE_ASSERTS "Debug;RelWithDebInfo")
|
|||
addDef(TORQUE_DEBUG_GFX_MODE "RelWithDebInfo")
|
||||
addDef(TORQUE_OGGVORBIS)
|
||||
|
||||
if (TORQUE_THEORA)
|
||||
addDef(TORQUE_OGGTHEORA)
|
||||
endif(TORQUE_THEORA)
|
||||
|
||||
if(NOT TORQUE_SDL)
|
||||
filterOut("platform/nativeDialogs/fileDialog.cpp" )
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Reference in a new issue