Merge branch 'alpha40Macwork' of https://github.com/Azaezel/Torque3D into alpha40Macwork

This commit is contained in:
Brian Roberts 2019-05-23 02:27:22 -05:00
commit 7cab44af6f
12 changed files with 110 additions and 72 deletions

View file

@ -149,6 +149,8 @@ endif()
if(WIN32)
option(TORQUE_D3D11 "Allow Direct3D 11 render" ON)
addDef(TORQUE_D3D11)
endif()
option(TORQUE_DEDICATED "Torque dedicated" OFF)
@ -314,7 +316,6 @@ addPath("${srcDir}/scene")
addPath("${srcDir}/scene/culling")
addPath("${srcDir}/scene/zones")
addPath("${srcDir}/scene/mixin")
addPath("${srcDir}/shaderGen")
addPath("${srcDir}/terrain")
addPath("${srcDir}/environment")
addPath("${srcDir}/forest")