d3dtrace,d3dretrace: Remove D3DX9 headers.

No longer needed, and D3DX is deprecated upstream.

diff --git a/dispatch/d3d9imports.hpp b/dispatch/d3d9imports.hpp
index 1a22a59b2c604e76947a3d422068f91e46800840..a07d768bd67d1fd9707684ecf16772055c1f7e12 100644 (file)
--- a/dispatch/d3d9imports.hpp
+++ b/dispatch/d3d9imports.hpp
@@ -35,7 +35,6 @@
 #include "compat.h"
 
 #include <d3d9.h>
-#include <d3dx9.h>
 
 
 #ifndef D3DFMT_A2B10G10R10_XR_BIAS

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index 57079b59a38f837198223359da3cad029b984978..2e33b547b7a1ecddfd83014544aed32fb32fb807 100644 (file)
--- a/retrace/CMakeLists.txt
+++ b/retrace/CMakeLists.txt
@@ -129,7 +129,7 @@ if (ENABLE_EGL AND X11_FOUND AND NOT WIN32 AND NOT APPLE)
     install (TARGETS eglretrace RUNTIME DESTINATION bin) 
 endif ()
 
-if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
+if (WIN32)
     if (DirectX_D3D8_INCLUDE_DIR) 
         include_directories (BEFORE SYSTEM ${DirectX_D3D8_INCLUDE_DIR})
         set (HAVE_D3D8 1)
@@ -151,10 +151,15 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
                 ${CMAKE_SOURCE_DIR}/specs/stdapi.py
     )
 
-    include_directories (BEFORE SYSTEM ${DirectX_D3DX9_INCLUDE_DIR})
+    if (DirectX_D3D9_INCLUDE_DIR)
+        include_directories (BEFORE SYSTEM ${DirectX_D3D9_INCLUDE_DIR})
+        set (HAVE_D3D9 1)
+    else ()
+        set (HAVE_D3D9 0)
+    endif ()
     add_custom_command (
         OUTPUT d3dretrace_d3d9.cpp
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9retrace.py d3d9 1 > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d9.cpp
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9retrace.py d3d9 ${HAVE_D3D9} > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d9.cpp
         DEPENDS
                 d3d9retrace.py
                 dllretrace.py

diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt
index 8a0e7690810c988fb1a79a3aee86af64e146bc9d..6c33ead54ecc58b1370ce04852cec5312b17b429 100644 (file)
--- a/wrappers/CMakeLists.txt
+++ b/wrappers/CMakeLists.txt
@@ -60,8 +60,8 @@ if (WIN32)
     endif ()
 
     # d3d8.dll
-    if (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR)
-        include_directories (BEFORE SYSTEM ${DirectX_D3DX9_INCLUDE_DIR} ${DirectX_D3D8_INCLUDE_DIR})
+    if (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3D9_INCLUDE_DIR)
+        include_directories (BEFORE SYSTEM ${DirectX_D3D9_INCLUDE_DIR} ${DirectX_D3D8_INCLUDE_DIR})
         add_custom_command (
             OUTPUT d3d8trace.cpp
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8trace.cpp
@@ -96,8 +96,8 @@ if (WIN32)
     endif ()
 
     # d3d9.dll
-    if (DirectX_D3DX9_INCLUDE_DIR)
-        include_directories (BEFORE SYSTEM ${DirectX_D3DX9_INCLUDE_DIR})
+    if (DirectX_D3D9_INCLUDE_DIR)
+        include_directories (BEFORE SYSTEM ${DirectX_D3D9_INCLUDE_DIR})
         add_custom_command (
             OUTPUT d3d9trace.cpp
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9trace.cpp