Fix #1602

Build/Scripts/BuildWindows.js

@@ -69,7 +69,7 @@ namespace('build', function() {
 
       // graphics backend overrides, defaults to D3D11
       flags += " -DATOMIC_OPENGL=" + (config["opengl"] ? "ON" : "OFF");
-      flags += " -DATOMIC_D3D11=" + (config["d3d9"] ? "OFF" : "ON");
+      flags += " -DATOMIC_D3D9=" + (config["d3d9"] ? "ON" : "OFF");
 
       flags += "\"";
 

Source/Atomic/CMakeLists.txt

@@ -32,14 +32,15 @@ elseif (ATOMIC_DATABASE_ODBC)
 endif ()
 
 if (WIN32)
-    option (ATOMIC_D3D11 "Use DirectX 11" ON)
+    option (ATOMIC_D3D9 "Use DirectX 9" OFF)
     option (ATOMIC_OPENGL "Use OpenGL" OFF)
-    if (ATOMIC_D3D11) # DirectX 11
-        file (GLOB GRAPHICS_IMPL_SOURCE Graphics/Direct3D11/*.cpp Graphics/Direct3D11/*.h)
+    if (ATOMIC_D3D9) # DirectX 9
+        file (GLOB GRAPHICS_IMPL_SOURCE Graphics/Direct3D9/*.cpp Graphics/Direct3D9/*.h)
     elseif (ATOMIC_OPENGL) # OpenGL
         file (GLOB GRAPHICS_IMPL_SOURCE Graphics/OpenGL/*.cpp Graphics/OpenGL/*.h)
-    else() # DirectX 9
-        file (GLOB GRAPHICS_IMPL_SOURCE Graphics/Direct3D9/*.cpp Graphics/Direct3D9/*.h)
+    else() # DirectX 11
+        file (GLOB GRAPHICS_IMPL_SOURCE Graphics/Direct3D11/*.cpp Graphics/Direct3D11/*.h)
+        set(ATOMIC_D3D11 ON)
     endif()
 else()
     file (GLOB GRAPHICS_IMPL_SOURCE Graphics/OpenGL/*.cpp Graphics/OpenGL/*.h)
@@ -139,10 +140,9 @@ elseif (WIN32)
         target_compile_definitions (Atomic PRIVATE ${OpenGL_DEFINITIONS})
         target_compile_definitions (Atomic PUBLIC -DGLEW_STATIC=1)
         target_link_libraries (Atomic GLEW opengl32 glu32)
-    else() # DirectX 9
+    elseif(ATOMIC_D3D9) # DirectX 9
         target_link_libraries (Atomic d3d9 d3dcompiler)
         target_compile_definitions (Atomic PUBLIC -DATOMIC_D3D9=1)
-        set (ATOMIC_D3D9 1)
     endif()
     target_link_libraries(Atomic MojoShader user32 gdi32 winmm imm32 ole32 oleaut32 version uuid Ws2_32)