More state.

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9da61a1d5a01cc7563a04548eaab311a8b643d58..3528b5f6d7d9e7fa146451e48bce06d0cfc172f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,7 +119,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 add_custom_command (
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glproc.py > ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
-    DEPENDS glproc.py wglapi.py glxapi.py glapi.py glenum.py stdapi.py
+    DEPENDS glproc.py dispatch.py wglapi.py glxapi.py glapi.py glenum.py stdapi.py
 )
 
 if (WIN32)
@@ -166,7 +166,7 @@ if (WIN32)
     add_custom_command (
         OUTPUT wgltrace.cpp
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/wgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/wgltrace.cpp
-        DEPENDS wgltrace.py trace.py wglapi.py glapi.py glenum.py winapi.py stdapi.py
+        DEPENDS wgltrace.py gltrace.py trace.py wglapi.py wglenum.py glapi.py glenum.py winapi.py stdapi.py
     )
     add_library (opengl SHARED opengl32.def wgltrace.cpp trace_write.cpp os_win32.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
     set_target_properties (opengl PROPERTIES
@@ -182,7 +182,7 @@ else ()
     add_custom_command (
         OUTPUT glxtrace.cpp
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glxtrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glxtrace.cpp
-        DEPENDS glxtrace.py trace.py glxapi.py glapi.py glenum.py stdapi.py
+        DEPENDS glxtrace.py gltrace.py trace.py glxapi.py glapi.py glenum.py stdapi.py
     )
 
     add_library (glxtrace SHARED glxtrace.cpp trace_write.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
@@ -193,14 +193,17 @@ else ()
     target_link_libraries (glxtrace dl)
 endif ()
 
-add_executable (dump dump.cpp trace_model.cpp)
-
 if (WIN32)
     set (os os_win32.cpp)
 else (WIN32)
     set (os os_posix.cpp)
 endif (WIN32)
 
+add_library (trace trace_model.cpp trace_parser.cpp ${os})
+
+add_executable (dump dump.cpp)
+target_link_libraries (dump trace)
+
 if (GLUT_INCLUDE_DIR)
     add_custom_command (
         OUTPUT glretrace.cpp
@@ -208,15 +211,27 @@ if (GLUT_INCLUDE_DIR)
         DEPENDS glretrace.py retrace.py codegen.py glapi.py glenum.py stdapi.py
     )
 
+    add_custom_command (
+        OUTPUT glstate.cpp
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glstate.py > ${CMAKE_CURRENT_BINARY_DIR}/glstate.cpp
+        DEPENDS glstate.py glenum.py stdapi.py
+    )
+
     include_directories (
         ${CMAKE_CURRENT_BINARY_DIR}
         ${OPENGL_INCLUDE_PATH}
         ${GLUT_INCLUDE_DIR}
     )
 
-    add_executable (glretrace glretrace.cpp trace_model.cpp image.cpp ${os} ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+    add_executable (glretrace
+        glretrace.cpp
+        glstate.cpp
+        image.cpp 
+        ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
+    )
 
     target_link_libraries (glretrace
+        trace
         ${OPENGL_gl_LIBRARY}
         ${OPENGL_glu_LIBRARY}
         ${GLUT_glut_LIBRARY}