Merge pull request #1858 from Azaezel/options_ON

flips dx11, opengl, and sdl2 on by default now that those are no long…
GarageGames · Dec 21, 2016 · d3dd5ce · d3dd5ce
2 parents fb9bd03 + 714bf1a
commit d3dd5ce
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake
@@ -83,33 +83,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)
-	#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)
+	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
-	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
 ###############################################################################