Browse Source

Fix d3d9 quirk on first build.
Moved OpenGL config option to appropriate spot.

Rokas Kupstys 8 years ago
parent
commit
30ee01c386
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Source/Atomic/CMakeLists.txt

+ 2 - 2
Source/Atomic/CMakeLists.txt

@@ -32,6 +32,8 @@ elseif (ATOMIC_DATABASE_ODBC)
 endif ()
 endif ()
 
 
 if (WIN32)
 if (WIN32)
+    option (ATOMIC_D3D11 "Use DirectX 11" OFF)
+    option (ATOMIC_OPENGL "Use OpenGL" OFF)
     if (ATOMIC_D3D11) # DirectX 11
     if (ATOMIC_D3D11) # DirectX 11
         file (GLOB GRAPHICS_IMPL_SOURCE Graphics/Direct3D11/*.cpp Graphics/Direct3D11/*.h)
         file (GLOB GRAPHICS_IMPL_SOURCE Graphics/Direct3D11/*.cpp Graphics/Direct3D11/*.h)
     elseif (ATOMIC_OPENGL) # OpenGL
     elseif (ATOMIC_OPENGL) # OpenGL
@@ -125,8 +127,6 @@ elseif (LINUX)
     target_link_libraries (Atomic pthread GLEW GL dl)
     target_link_libraries (Atomic pthread GLEW GL dl)
     target_compile_definitions(Atomic PUBLIC -DATOMIC_PLATFORM_LINUX=1)
     target_compile_definitions(Atomic PUBLIC -DATOMIC_PLATFORM_LINUX=1)
 elseif (WIN32)
 elseif (WIN32)
-    option (ATOMIC_D3D11 "Use DirectX 11" ON)
-    option (ATOMIC_OPENGL "Use OpenGL" OFF)
     target_compile_definitions (Atomic PUBLIC -DATOMIC_PLATFORM_WINDOWS=1)
     target_compile_definitions (Atomic PUBLIC -DATOMIC_PLATFORM_WINDOWS=1)
     target_link_libraries (Atomic user32 gdi32 winmm imm32 ole32 oleaut32 version uuid Ws2_32)
     target_link_libraries (Atomic user32 gdi32 winmm imm32 ole32 oleaut32 version uuid Ws2_32)
     if (ATOMIC_D3D11) # DirectX 11
     if (ATOMIC_D3D11) # DirectX 11