Skip to content

Commit

Permalink
Fix d3d9 quirk on first build.
Browse files Browse the repository at this point in the history
Moved OpenGL config option to appropriate spot.
  • Loading branch information
rokups committed Jun 28, 2017
1 parent d24c488 commit 30ee01c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Source/Atomic/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ elseif (ATOMIC_DATABASE_ODBC)
endif ()

if (WIN32)
option (ATOMIC_D3D11 "Use DirectX 11" OFF)
option (ATOMIC_OPENGL "Use OpenGL" OFF)
if (ATOMIC_D3D11) # DirectX 11
file (GLOB GRAPHICS_IMPL_SOURCE Graphics/Direct3D11/*.cpp Graphics/Direct3D11/*.h)
elseif (ATOMIC_OPENGL) # OpenGL
Expand Down Expand Up @@ -125,8 +127,6 @@ elseif (LINUX)
target_link_libraries (Atomic pthread GLEW GL dl)
target_compile_definitions(Atomic PUBLIC -DATOMIC_PLATFORM_LINUX=1)
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_link_libraries (Atomic user32 gdi32 winmm imm32 ole32 oleaut32 version uuid Ws2_32)
if (ATOMIC_D3D11) # DirectX 11
Expand Down

0 comments on commit 30ee01c

Please sign in to comment.