dxgitrace: Fix build when recent d3d10 versions are not available.

diff --git a/wrappers/.gitignore b/wrappers/.gitignore
index 43ef5c85c77ed94a428abd19d20b22b4523dc238..dfd8c304bd29bcd5bf881e708b085484b5cb925c 100644 (file)
--- a/wrappers/.gitignore
+++ b/wrappers/.gitignore
@@ -4,6 +4,7 @@ d2d1trace.cpp
 d3d8trace.cpp
 d3d9trace.cpp
 dxgitrace.cpp
+dxgitrace.def
 ddrawtrace.cpp
 dlltrace.cpp
 egltrace.cpp

diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt
index be67bc0c3c8218b642579a45aebac467b3e11166..45af7e21d3a6608418fa2fa90b4039013d009a56 100644 (file)
--- a/wrappers/CMakeLists.txt
+++ b/wrappers/CMakeLists.txt
@@ -125,11 +125,20 @@ if (WIN32)
     # dxgi.dll, d3d10.dll, d3d10_1.dll, d3d11.dll
     set (DXGI_MODULES)
     if (DirectX_D3D10_INCLUDE_DIR)
+        set (DXGITRACE_DEF ${CMAKE_CURRENT_BINARY_DIR}/dxgitrace.def)
+        file (WRITE  ${DXGITRACE_DEF} "EXPORTS\n")
+        file (APPEND ${DXGITRACE_DEF} "CreateDXGIFactory\n")
+        file (APPEND ${DXGITRACE_DEF} "CreateDXGIFactory1\n")
+        file (APPEND ${DXGITRACE_DEF} "D3D10CreateDevice\n")
+        file (APPEND ${DXGITRACE_DEF} "D3D10CreateDeviceAndSwapChain\n")
+
         include_directories (SYSTEM ${DirectX_D3D10_INCLUDE_DIR})
         set (DXGI_MODULES d3d10)
         if (DirectX_D3D10_1_INCLUDE_DIR)
             include_directories (SYSTEM ${DirectX_D3D10_1_INCLUDE_DIR})
             set (DXGI_MODULES ${DXGI_MODULES} d3d10_1)
+            file (APPEND ${DXGITRACE_DEF} "D3D10CreateDevice1\n")
+            file (APPEND ${DXGITRACE_DEF} "D3D10CreateDeviceAndSwapChain1\n")
         endif ()
         if (DirectX_D3D11_INCLUDE_DIR)
             include_directories (SYSTEM ${DirectX_D3D11_INCLUDE_DIR})
@@ -138,6 +147,8 @@ if (WIN32)
                 include_directories (SYSTEM ${DirectX_D3D11_1_INCLUDE_DIR})
                 set (DXGI_MODULES ${DXGI_MODULES} d3d11_1)
             endif ()
+            file (APPEND ${DXGITRACE_DEF} "D3D11CreateDevice\n")
+            file (APPEND ${DXGITRACE_DEF} "D3D11CreateDeviceAndSwapChain\n")
         endif ()
         
         add_custom_command (
@@ -162,7 +173,7 @@ if (WIN32)
                 ${CMAKE_SOURCE_DIR}/specs/stdapi.py
         )
         add_library (dxgitrace SHARED
-            dxgitrace.def
+            ${DXGITRACE_DEF}
             dxgitrace.cpp
             d3dcommonshader.cpp
         )

diff --git a/wrappers/dxgitrace.def b/wrappers/dxgitrace.def
deleted file mode 100644 (file)
index 102b659..0000000
--- a/wrappers/dxgitrace.def
+++ /dev/null
@@ -1,12 +0,0 @@
-EXPORTS
-    CreateDXGIFactory
-    CreateDXGIFactory1
-
-    D3D10CreateDevice
-    D3D10CreateDeviceAndSwapChain
-
-    D3D10CreateDevice1
-    D3D10CreateDeviceAndSwapChain1
-
-    D3D11CreateDevice
-    D3D11CreateDeviceAndSwapChain