X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=a157889e3092e81457fb6aabc030c192b8c4a04b;hb=404a1eff54a13fe3b4113b8c0494d1860d6c86e7;hp=ab703582b464f09b693758e4ca85f1881b326e17;hpb=5caf870ab30803b921cb28b8009eb654e3ac2992;p=apitrace

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644
new mode 100755
index ab70358..a157889
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,9 @@ if (MSVC)
     # Enable math constants defines
     add_definitions (-D_USE_MATH_DEFINES)
 
+    # No min/max macros
+    add_definitions (-DNOMINMAX)
+
     # Adjust warnings
     add_definitions (-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
     add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
@@ -191,6 +194,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 ()
 
@@ -202,10 +210,10 @@ else (WIN32)
     set (glws glws_glx.cpp)
 endif (WIN32)
 
-add_library (trace trace_model.cpp trace_parser.cpp ${os})
+add_library (trace trace_model.cpp trace_parser.cpp trace_write.cpp ${os})
 
-add_executable (dump dump.cpp)
-target_link_libraries (dump trace)
+add_executable (tracedump tracedump.cpp)
+target_link_libraries (tracedump trace)
 
 add_custom_command (
     OUTPUT glretrace_gl.cpp
@@ -216,7 +224,7 @@ add_custom_command (
 add_custom_command (
     OUTPUT glretrace_state.cpp
     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glstate.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_state.cpp
-    DEPENDS glstate.py glenum.py stdapi.py
+    DEPENDS glstate.py glapi.py glenum.py stdapi.py
 )
 
 include_directories (