TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 05:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure that inclusion of any entity/component stuff is properly bracketed with the preprocessor check.

Browse source
This commit is contained in:
Areloch 2016-05-15 10:11:46 -05:00
parent 749ac4efc2
commit b04ad52b5d
7 changed files with 75 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Tools/CMake/torque3d.cmake
View file

@ -86,6 +86,9 @@ if(WIN32)
option(TORQUE_D3D11 "Allow Direct3D 11 render" OFF)
endif()
option(TORQUE_EXPERIMENTAL_EC "Experimental Entity/Component systems" OFF)
mark_as_advanced(TORQUE_EXPERIMENTAL_EC)
###############################################################################
# options
###############################################################################
@ -173,8 +176,6 @@ addPathRec("${srcDir}/app")
addPath("${srcDir}/sfx/media")
addPath("${srcDir}/sfx/null")
addPath("${srcDir}/sfx")
addPath("${srcDir}/component")
addPath("${srcDir}/component/interfaces")
addPath("${srcDir}/console")
addPath("${srcDir}/core")
addPath("${srcDir}/core/stream")
@ -254,7 +255,13 @@ addPath("${srcDir}/ts/arch")
addPath("${srcDir}/physics")
addPath("${srcDir}/gui/3d")
addPath("${srcDir}/postFx")
if(NOT TORQUE_EXPERIMENTAL_EC)
set(BLACKLIST "Entity.cpp;Entity.h" )
endif()
addPath("${srcDir}/T3D")
set(BLACKLIST "" )
addPath("${srcDir}/T3D/examples")
addPath("${srcDir}/T3D/fps")
addPath("${srcDir}/T3D/fx")
@ -264,6 +271,17 @@ addPath("${srcDir}/T3D/decal")
addPath("${srcDir}/T3D/sfx")
addPath("${srcDir}/T3D/gameBase")
addPath("${srcDir}/T3D/turret")
if( TORQUE_EXPERIMENTAL_EC )
addPath("${srcDir}/T3D/components/")
addPath("${srcDir}/T3D/components/animation")
addPath("${srcDir}/T3D/components/camera")
addPath("${srcDir}/T3D/components/collision")
addPath("${srcDir}/T3D/components/game")
addPath("${srcDir}/T3D/components/physics")
addPath("${srcDir}/T3D/components/render")
endif()
addPath("${srcDir}/main/")
addPath("${srcDir}/assets")
addPath("${srcDir}/module")
@ -341,7 +359,11 @@ if(TORQUE_TOOLS)
addPath("${srcDir}/environment/editors")
addPath("${srcDir}/forest/editor")
addPath("${srcDir}/gui/editor")
if(NOT TORQUE_EXPERIMENTAL_EC)
set(BLACKLIST "entityGroup.cpp;entityGroup.h;mountingGroup.cpp;mountingGroup.h" )
endif()
addPath("${srcDir}/gui/editor/inspector")
set(BLACKLIST "" )
endif()
if(TORQUE_HIFI)