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

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644
new mode 100755
index d90f029..a157889
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,21 +24,26 @@ if (NOT WIN32)
     # to deploy the wrappers DLLs
     find_package (ZLIB)
     find_package (PNG)
+    find_package (X11 REQUIRED)
 else (NOT WIN32)
     find_package (DirectX)
 endif (NOT WIN32)
 
-find_package (GLUT)
-
 if (WIN32)
     # MSVC & MinGW only define & use APIENTRY
     add_definitions (-DGLAPIENTRY=__stdcall)
 endif (WIN32)
 
 if (MSVC)
+    # C99 includes for msvc
+    include_directories (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)
@@ -179,6 +184,7 @@ if (WIN32)
     endif (MINGW)
 
 else ()
+    include_directories (${X11_INCLUDE_DIR})
 
     # libGL.so
     add_custom_command (
@@ -188,57 +194,70 @@ else ()
     )
 
     add_library (glxtrace SHARED glxtrace.cpp trace_write.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
-    set_target_properties (glxtrace PROPERTIES 
-        COMPILER_DEFINITIONS "-DRETRACE"
+
+    set_target_properties (glxtrace PROPERTIES
         PREFIX ""
     )
+
     target_link_libraries (glxtrace dl)
 endif ()
 
 if (WIN32)
     set (os os_win32.cpp)
+    set (glws glws_wgl.cpp)
 else (WIN32)
     set (os os_posix.cpp)
+    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)
 
-if (GLUT_INCLUDE_DIR)
-    add_custom_command (
-        OUTPUT glretrace.cpp
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace.cpp
-        DEPENDS glretrace.py retrace.py codegen.py glapi.py glenum.py stdapi.py
-    )
+add_custom_command (
+    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
-    )
+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 glapi.py glenum.py stdapi.py
+)
 
-    include_directories (
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${OPENGL_INCLUDE_PATH}
-        ${GLUT_INCLUDE_DIR}
-    )
+include_directories (
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${OPENGL_INCLUDE_PATH}
+)
 
-    add_executable (glretrace
-        glretrace.cpp
-        glstate.cpp
-        image.cpp 
-        ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
-    )
+add_executable (glretrace
+    glretrace_gl.cpp
+    glretrace_main.cpp
+    glretrace_state.cpp
+    retrace.cpp
+    ${glws}
+    image.cpp 
+    ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
+)
 
-    target_link_libraries (glretrace
-        trace
-        ${OPENGL_gl_LIBRARY}
-        ${OPENGL_glu_LIBRARY}
-        ${GLUT_glut_LIBRARY}
-    )
-endif (GLUT_INCLUDE_DIR)
+set_property (
+    TARGET glretrace
+    APPEND
+    PROPERTY COMPILE_DEFINITIONS "RETRACE"
+)
+
+target_link_libraries (glretrace
+    trace
+    ${OPENGL_gl_LIBRARY}
+    ${OPENGL_glu_LIBRARY}
+    ${X11_LIBRARIES}
+)
+
+if (NOT WIN32)
+    target_link_libraries (glretrace ${X11_LIBRARIES})
+endif (NOT WIN32)
 
 if (QT4_FOUND AND QJSON_FOUND)
     add_subdirectory(gui)