From 714bf1afba01e7679886c1bf301336b422264379 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Thu, 25 Aug 2016 16:53:09 -0500 Subject: [PATCH] flips dx11, opengl, and sdl2 on by default now that those are no longer experimental. also seperates out the dedicated flag for compilation on windows --- Tools/CMake/torque3d.cmake | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index d3727933c..0434773ac 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -64,33 +64,30 @@ option(TORQUE_HIFI "HIFI? support" OFF) mark_as_advanced(TORQUE_HIFI) option(TORQUE_EXTENDED_MOVE "Extended move support" OFF) mark_as_advanced(TORQUE_EXTENDED_MOVE) + if(WIN32) - option(TORQUE_SDL "Use SDL for window and input" OFF) + option(TORQUE_SDL "Use SDL for window and input" ON) else() set(TORQUE_SDL ON) # we need sdl to work on Linux/Mac endif() + if(WIN32) - option(TORQUE_OPENGL "Allow OpenGL render" OFF) + option(TORQUE_OPENGL "Allow OpenGL render" ON) #mark_as_advanced(TORQUE_OPENGL) else() set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac endif() if(WIN32) - option(TORQUE_OPENGL "Allow OpenGL render" OFF) - #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) + option(TORQUE_D3D11 "Allow Direct3D 11 render" ON) endif() option(TORQUE_EXPERIMENTAL_EC "Experimental Entity/Component systems" OFF) mark_as_advanced(TORQUE_EXPERIMENTAL_EC) +option(TORQUE_DEDICATED "Torque dedicated" OFF) +mark_as_advanced(TORQUE_DEDICATED) + ############################################################################### # options ###############################################################################