Merge branch 'master' into d2d

[apitrace] / retrace / CMakeLists.txt

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index 6b5e61a494800e95577454415f37d66d2ff48f28..63fbed63fab1b7564b270661f14be07668955c3d 100644 (file)
--- 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
@@ -51,6 +52,7 @@ add_library (glretrace_common
     glretrace_wgl.cpp
     glretrace_egl.cpp
     glretrace_main.cpp
+    glretrace_ws.cpp
     glstate.cpp
     glstate_images.cpp
     glstate_params.cpp
@@ -144,10 +146,10 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
 
     include_directories (SYSTEM ${DirectX_D3DX9_INCLUDE_DIR})
     add_executable (d3dretrace
-        retrace.cpp
-        retrace_stdc.cpp
         d3dretrace_main.cpp
         d3dretrace_d3d9.cpp
+        d3dretrace_ws.cpp
+        d3dstate.cpp
         d3dstate_images.cpp
     )
     target_link_libraries (d3dretrace