if (WIN32)
set (os os_win32.cpp)
- set (glws glws_wgl.cpp)
+ set (glws_os glws_wgl.cpp)
else (WIN32)
set (os os_posix.cpp)
- set (glws glws_glx.cpp)
+ set (glws_os glws_glx.cpp)
endif (WIN32)
-add_library (common
+add_library (common STATIC
common/trace_file.cpp
common/trace_snappyfile.cpp
common/trace_model.cpp
set_target_properties (common PROPERTIES
# Ensure it can be statically linked in shared libraries
- COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}"
+ COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}"
)
link_libraries (common)
# API tracers
if (WIN32)
+ if (MINGW)
+ # Silence warnings about @nn suffix mismatch
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--enable-stdcall-fixup")
+ endif (MINGW)
+
# ddraw.dll
if (DirectX_D3D_INCLUDE_DIR)
include_directories (SYSTEM ${DirectX_D3D_INCLUDE_DIR})
add_custom_command (
OUTPUT d3d10trace.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10trace.cpp
- DEPENDS d3d10trace.py trace.py specs/d3d10misc.py specs/d3d10.py specs/dxgi.py specs/winapi.py specs/stdapi.py
+ DEPENDS d3d10trace.py trace.py specs/d3d10misc.py specs/d3d10.py specs/dxgi.py specs/dxgitype.py specs/dxgiformat.py specs/winapi.py specs/stdapi.py
)
add_library (d3d10 MODULE specs/d3d10.def d3d10trace.cpp)
set_target_properties (d3d10
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- if (MINGW)
- set_target_properties(wgltrace PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup")
- endif (MINGW)
install (TARGETS wgltrace LIBRARY DESTINATION wrappers)
elseif (APPLE)
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 specs/glapi.py specs/gltypes.py specs/stdapi.py
+ DEPENDS glretrace.py retrace.py specs/glapi.py specs/gltypes.py specs/stdapi.py
)
add_custom_command (
glstate.cpp
glstate_params.cpp
retrace.cpp
- ${glws}
+ glws.cpp
+ ${glws_os}
${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
)
TODO.markdown
DESTINATION doc)
-set (CPACK_PACKAGE_VERSION_MAJOR "1")
+set (CPACK_PACKAGE_VERSION_MAJOR "2")
set (CPACK_PACKAGE_VERSION_MINOR "0")
# Use current date in YYYYMMDD format as patch number