X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2FCMakeLists.txt;h=c582338c00cd9534365879e44cb3bf7dd5248f06;hb=8739fa62b41d54455447a27c4185371366bd726e;hp=8d638d017b677cec50df93927bf2d68e1bc7f643;hpb=d63a361f67ab8db48fe71c3b3de737f48257c4f8;p=apitrace

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index 8d638d0..c582338 100644
--- a/retrace/CMakeLists.txt
+++ b/retrace/CMakeLists.txt
@@ -35,6 +35,7 @@ add_library (retrace_common
     retrace.cpp
     retrace_main.cpp
     retrace_stdc.cpp
+    retrace_swizzle.cpp
 )
 
 target_link_libraries (retrace_common
@@ -42,6 +43,7 @@ target_link_libraries (retrace_common
     ${PNG_LIBRARIES}
     ${ZLIB_LIBRARIES}
     ${SNAPPY_LIBRARIES}
+    ${GETOPT_LIBRARIES}
 )
 
 add_library (glretrace_common
@@ -128,11 +130,12 @@ if (ENABLE_EGL AND X11_FOUND AND NOT WIN32 AND NOT APPLE)
 endif ()
 
 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}/d3dretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d9.cpp
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9retrace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d9.cpp
         DEPENDS
-                d3dretrace.py
+                d3d9retrace.py
                 dllretrace.py
                 retrace.py
                 ${CMAKE_SOURCE_DIR}/dispatch/dispatch.py
@@ -143,19 +146,65 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
                 ${CMAKE_SOURCE_DIR}/specs/stdapi.py
     )
 
-    include_directories (SYSTEM ${DirectX_D3DX9_INCLUDE_DIR})
+    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 ()
+    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 (D3D11STATE_SOURCES
+            d3d11state.cpp
+            d3d11state_images.cpp
+        )
+    endif ()
+
+    add_custom_command (
+        OUTPUT d3dretrace_d3d10.cpp
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3dcommonretrace.py ${D3D10_MODULES} > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d10.cpp
+        DEPENDS
+                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
+                ${CMAKE_SOURCE_DIR}/specs/d3d10shader.py
+                ${CMAKE_SOURCE_DIR}/specs/d3d10effect.py
+                ${CMAKE_SOURCE_DIR}/specs/d3dcommon.py
+                ${CMAKE_SOURCE_DIR}/specs/dxgi.py
+                ${CMAKE_SOURCE_DIR}/specs/dxgitype.py
+                ${CMAKE_SOURCE_DIR}/specs/dxgiformat.py
+                ${CMAKE_SOURCE_DIR}/specs/winapi.py
+                ${CMAKE_SOURCE_DIR}/specs/stdapi.py
+    )
+
     add_executable (d3dretrace
-        retrace.cpp
-        retrace_stdc.cpp
         d3dretrace_main.cpp
         d3dretrace_d3d9.cpp
-        d3dstate.cpp
-        d3dstate_images.cpp
+        d3dretrace_d3d10.cpp
+        d3dretrace_ws.cpp
+        d3d9state.cpp
+        d3d9state_images.cpp
+        ${D3D11STATE_SOURCES}
     )
     target_link_libraries (d3dretrace
         retrace_common
     )
-    
-    install (TARGETS d3dretrace RUNTIME DESTINATION bin) 
-endif ()
 
+    install (TARGETS d3dretrace RUNTIME DESTINATION bin)
+endif ()