X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=inline;f=retrace%2FCMakeLists.txt;h=63fbed63fab1b7564b270661f14be07668955c3d;hb=32b223c5dca493e873d0a58a859ca4ff3e8fbd9c;hp=644fe987d4e17a85d46d39edb01e87293ab11378;hpb=4f242f43bf4b3c8f5daadc4496c0e84ae55117b3;p=apitrace

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index 644fe98..63fbed6 100644
--- a/retrace/CMakeLists.txt
+++ b/retrace/CMakeLists.txt
@@ -3,7 +3,9 @@
 
 include_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/helpers
     ${CMAKE_BINARY_DIR}/dispatch
+    ${CMAKE_SOURCE_DIR}/dispatch
 )
 
 add_definitions (-DRETRACE)
@@ -30,22 +32,36 @@ add_custom_command (
 )
 
 add_library (retrace_common
+    retrace.cpp
+    retrace_main.cpp
+    retrace_stdc.cpp
+    retrace_swizzle.cpp
+)
+
+target_link_libraries (retrace_common
+    common
+    ${PNG_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+    ${SNAPPY_LIBRARIES}
+)
+
+add_library (glretrace_common
     glretrace_gl.cpp
     glretrace_cgl.cpp
     glretrace_glx.cpp
     glretrace_wgl.cpp
     glretrace_egl.cpp
     glretrace_main.cpp
+    glretrace_ws.cpp
     glstate.cpp
     glstate_images.cpp
     glstate_params.cpp
     glstate_shaders.cpp
-    retrace.cpp
-    retrace_stdc.cpp
     glws.cpp
 )
 
-add_dependencies (retrace_common glproc)
+add_dependencies (glretrace_common glproc)
+
 
 if (WIN32 OR APPLE OR X11_FOUND)
     add_executable (glretrace
@@ -56,11 +72,8 @@ if (WIN32 OR APPLE OR X11_FOUND)
 
     target_link_libraries (glretrace
         retrace_common
+        glretrace_common
         glproc_gl
-        common
-        ${PNG_LIBRARIES}
-        ${ZLIB_LIBRARIES}
-        ${SNAPPY_LIBRARIES}
     )
 
     if (WIN32)
@@ -101,11 +114,8 @@ if (ENABLE_EGL AND X11_FOUND AND NOT WIN32 AND NOT APPLE)
 
     target_link_libraries (eglretrace
         retrace_common
+        glretrace_common
         glproc_egl
-        common
-        ${PNG_LIBRARIES}
-        ${ZLIB_LIBRARIES}
-        ${SNAPPY_LIBRARIES}
         ${X11_X11_LIB}
         ${CMAKE_THREAD_LIBS_INIT}
         dl
@@ -136,15 +146,16 @@ 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
-        common
-        ${ZLIB_LIBRARIES}
-        ${SNAPPY_LIBRARIES}
+        retrace_common
     )
+    
+    install (TARGETS d3dretrace RUNTIME DESTINATION bin) 
 endif ()