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

Merge pull request #1858 from Azaezel/options_ON

Browse source 
flips dx11, opengl, and sdl2 on by default now that those are no long…
This commit is contained in:
Areloch 2016-12-20 23:36:29 -06:00 • committed by GitHub
commit d3dd5ce235
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Tools/CMake/torque3d.cmake
View file

@ -83,33 +83,30 @@ option(TORQUE_HIFI "HIFI? support" OFF)
mark_as_advanced(TORQUE_HIFI) mark_as_advanced(TORQUE_HIFI)
option(TORQUE_EXTENDED_MOVE "Extended move support" OFF) option(TORQUE_EXTENDED_MOVE "Extended move support" OFF)
mark_as_advanced(TORQUE_EXTENDED_MOVE) mark_as_advanced(TORQUE_EXTENDED_MOVE)
if(WIN32) if(WIN32)
option(TORQUE_SDL "Use SDL for window and input" OFF) option(TORQUE_SDL "Use SDL for window and input" ON)
else() else()
set(TORQUE_SDL ON) # we need sdl to work on Linux/Mac set(TORQUE_SDL ON) # we need sdl to work on Linux/Mac
endif() endif()
if(WIN32) if(WIN32)
option(TORQUE_OPENGL "Allow OpenGL render" OFF) option(TORQUE_OPENGL "Allow OpenGL render" ON)
#mark_as_advanced(TORQUE_OPENGL) #mark_as_advanced(TORQUE_OPENGL)
else() else()
set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac
endif() endif()
if(WIN32) if(WIN32)
option(TORQUE_OPENGL "Allow OpenGL render" OFF) option(TORQUE_D3D11 "Allow Direct3D 11 render" ON)
#mark_as_advanced(TORQUE_OPENGL)
else()
set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac
option(TORQUE_DEDICATED "Torque dedicated" OFF)
endif()
if(WIN32)
option(TORQUE_D3D11 "Allow Direct3D 11 render" OFF)
endif() endif()
option(TORQUE_EXPERIMENTAL_EC "Experimental Entity/Component systems" OFF) option(TORQUE_EXPERIMENTAL_EC "Experimental Entity/Component systems" OFF)
mark_as_advanced(TORQUE_EXPERIMENTAL_EC) mark_as_advanced(TORQUE_EXPERIMENTAL_EC)
option(TORQUE_DEDICATED "Torque dedicated" OFF)
mark_as_advanced(TORQUE_DEDICATED)
############################################################################### ###############################################################################
# options # options
############################################################################### ###############################################################################