X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2FCMakeLists.txt;h=383417d5a1b2d419f6f85cce4175bc30e8c047ea;hb=529cf9b67e67bdd4cad619e1e9347134375d649d;hp=69612f029cb3dc787fd3a935293cb68ae952f07c;hpb=af366b25cb9db606ec37069119b428fb9be4a163;p=apitrace

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index 69612f0..383417d 100644
--- a/retrace/CMakeLists.txt
+++ b/retrace/CMakeLists.txt
@@ -43,6 +43,7 @@ target_link_libraries (retrace_common
     ${PNG_LIBRARIES}
     ${ZLIB_LIBRARIES}
     ${SNAPPY_LIBRARIES}
+    ${GETOPT_LIBRARIES}
 )
 
 add_library (glretrace_common
@@ -128,7 +129,8 @@ 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 AND DirectX_D3D10_INCLUDE_DIR)
+if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
+    include_directories (SYSTEM ${DirectX_D3DX9_INCLUDE_DIR})
     add_custom_command (
         OUTPUT d3dretrace_d3d9.cpp
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9retrace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d9.cpp
@@ -144,14 +146,44 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR AND DirectX_D3D10_INCLUDE_DIR)
                 ${CMAKE_SOURCE_DIR}/specs/stdapi.py
     )
 
+    if (DirectX_D3D10_INCLUDE_DIR)
+        include_directories (SYSTEM ${DirectX_D3D10_INCLUDE_DIR})
+        set (D3D10_MODULES d3d10)
+        if (DirectX_D3D10_1_INCLUDE_DIR)
+            include_directories (SYSTEM ${DirectX_D3D10_1_INCLUDE_DIR})
+            set (D3D10_MODULES ${D3D10_MODULES} d3d10_1)
+        endif ()
+        set (D3DSTATE_SOURCES ${D3DSTATE_SOURCES}
+            d3d10state.cpp
+            d3d10state_images.cpp
+        )
+    endif ()
+
+    if (DirectX_D3D11_INCLUDE_DIR)
+        include_directories (SYSTEM ${DirectX_D3D11_INCLUDE_DIR})
+        set (D3D10_MODULES ${D3D10_MODULES} d3d11)
+        if (DirectX_D3D11_1_INCLUDE_DIR)
+            include_directories (SYSTEM ${DirectX_D3D11_1_INCLUDE_DIR})
+            set (D3D10_MODULES ${D3D10_MODULES} d3d11_1)
+        endif ()
+        set (D3DSTATE_SOURCES ${D3DSTATE_SOURCES}
+            d3d11state.cpp
+            d3d11state_images.cpp
+        )
+    endif ()
+
     add_custom_command (
         OUTPUT d3dretrace_d3d10.cpp
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10retrace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d10.cpp
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3dcommonretrace.py ${D3D10_MODULES} > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d10.cpp
         DEPENDS
-                d3d10retrace.py
+                d3dcommonretrace.py
                 dllretrace.py
                 retrace.py
                 ${CMAKE_SOURCE_DIR}/dispatch/dispatch.py
+                ${CMAKE_SOURCE_DIR}/specs/d3d11_1.py
+                ${CMAKE_SOURCE_DIR}/specs/d3d11.py
+                ${CMAKE_SOURCE_DIR}/specs/d3d11sdklayers.py
+                ${CMAKE_SOURCE_DIR}/specs/d3d10_1.py
                 ${CMAKE_SOURCE_DIR}/specs/d3d10.py
                 ${CMAKE_SOURCE_DIR}/specs/d3d10misc.py
                 ${CMAKE_SOURCE_DIR}/specs/d3d10sdklayers.py
@@ -165,7 +197,6 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR AND DirectX_D3D10_INCLUDE_DIR)
                 ${CMAKE_SOURCE_DIR}/specs/stdapi.py
     )
 
-    include_directories (SYSTEM ${DirectX_D3DX9_INCLUDE_DIR})
     add_executable (d3dretrace
         d3dretrace_main.cpp
         d3dretrace_d3d9.cpp
@@ -173,11 +204,11 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR AND DirectX_D3D10_INCLUDE_DIR)
         d3dretrace_ws.cpp
         d3d9state.cpp
         d3d9state_images.cpp
+        ${D3DSTATE_SOURCES}
     )
     target_link_libraries (d3dretrace
         retrace_common
     )
-    
-    install (TARGETS d3dretrace RUNTIME DESTINATION bin) 
-endif ()
 
+    install (TARGETS d3dretrace RUNTIME DESTINATION bin)
+endif ()