Synchronize X and GL on windows resizes.

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fb356e9aaf60c75cf97141fb1cec25f7ae2e443..19ef467f9f8ecfb911b9d91b66924bd378be68fb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,9 @@ if (WIN32)
 endif (WIN32)
 
 if (MSVC)
+    # C99 includes for msvc
+    include_directories (msvc)
+
     # Enable math constants defines
     add_definitions (-D_USE_MATH_DEFINES)
 
@@ -188,6 +191,11 @@ else ()
     )
 
     add_library (glxtrace SHARED glxtrace.cpp trace_write.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+
+    set_target_properties (glxtrace PROPERTIES
+        PREFIX ""
+    )
+
     target_link_libraries (glxtrace dl)
 endif ()
 
@@ -205,15 +213,15 @@ add_executable (dump dump.cpp)
 target_link_libraries (dump trace)
 
 add_custom_command (
-    OUTPUT glretrace.cpp
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace.cpp
+    OUTPUT glretrace_gl.cpp
+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
     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
+    OUTPUT glretrace_state.cpp
+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glstate.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_state.cpp
+    DEPENDS glstate.py glapi.py glenum.py stdapi.py
 )
 
 include_directories (
@@ -222,8 +230,10 @@ include_directories (
 )
 
 add_executable (glretrace
-    glretrace.cpp
-    glstate.cpp
+    glretrace_gl.cpp
+    glretrace_main.cpp
+    glretrace_state.cpp
+    retrace.cpp
     ${glws}
     image.cpp 
     ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp