Merge branch 'union-type'

[apitrace] / retrace / CMakeLists.txt

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index 5a46d3e8c578315dff3d6fb11532ba4f856c1e4e..383417d5a1b2d419f6f85cce4175bc30e8c047ea 100644 (file)
--- 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
@@ -147,25 +148,33 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
 
     if (DirectX_D3D10_INCLUDE_DIR)
         include_directories (SYSTEM ${DirectX_D3D10_INCLUDE_DIR})
-        set (MODULES d3d10)
+        set (D3D10_MODULES d3d10)
         if (DirectX_D3D10_1_INCLUDE_DIR)
             include_directories (SYSTEM ${DirectX_D3D10_1_INCLUDE_DIR})
-            set (MODULES ${MODULES} d3d10_1)
+            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 (MODULES ${MODULES} d3d11)
+        set (D3D10_MODULES ${D3D10_MODULES} d3d11)
         if (DirectX_D3D11_1_INCLUDE_DIR)
             include_directories (SYSTEM ${DirectX_D3D11_1_INCLUDE_DIR})
-            set (MODULES ${MODULES} d3d11_1)
+            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}/d3dcommonretrace.py ${MODULES} > ${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
                 d3dcommonretrace.py
                 dllretrace.py
@@ -195,6 +204,7 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
         d3dretrace_ws.cpp
         d3d9state.cpp
         d3d9state_images.cpp
+        ${D3DSTATE_SOURCES}
     )
     target_link_libraries (d3dretrace
         retrace_common