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)
add_definitions (-W4)
+ add_definitions (-wd4063) # not a valid value for switch of enum
+ add_definitions (-wd4127) # conditional expression is constant
add_definitions (-wd4244) # conversion from 'type1' to 'type2', possible loss of data
add_definitions (-wd4505) # unreferenced local function has been removed
add_definitions (-wd4800) # forcing value to bool 'true' or 'false' (performance warning)
set (glws glws_glx.cpp)
endif (WIN32)
-add_library (trace trace_model.cpp trace_parser.cpp trace_write.cpp ${os})
+add_library (trace trace_model.cpp trace_parser.cpp trace_writer.cpp trace_model_writer.cpp ${os})
add_executable (tracedump tracedump.cpp)
target_link_libraries (tracedump trace)
# API tracers
if (WIN32)
+ # ddraw.dll
+ if (DirectX_D3D_INCLUDE_DIR)
+ include_directories (${DirectX_D3D_INCLUDE_DIR})
+ add_custom_command (
+ OUTPUT ddraw.cpp
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d.py > ${CMAKE_CURRENT_BINARY_DIR}/ddraw.cpp
+ DEPENDS d3d.py d3dtypes.py d3dcaps.py ddraw.py trace.py winapi.py stdapi.py
+ )
+ add_library (ddraw SHARED ddraw.def ddraw.cpp trace_writer.cpp os_win32.cpp)
+ set_target_properties (ddraw
+ PROPERTIES PREFIX ""
+ RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
+ LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
+ )
+ install (TARGETS ddraw RUNTIME DESTINATION wrappers)
+ endif (DirectX_D3D_INCLUDE_DIR)
+
# d3d8.dll
- if (DirectX_D3D8_INCLUDE_DIR)
- include_directories (${DirectX_D3D8_INCLUDE_DIR})
+ if (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR)
+ include_directories (${DirectX_D3D8_INCLUDE_DIR} ${DirectX_D3DX9_INCLUDE_DIR})
add_custom_command (
OUTPUT d3d8.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8.cpp
- DEPENDS d3d8.py trace.py d3d8types.py d3d8caps.py d3dshader.py winapi.py stdapi.py
+ DEPENDS d3d8.py trace.py d3d8types.py d3d8caps.py winapi.py stdapi.py
)
- add_library (d3d8 SHARED d3d8.def d3d8.cpp trace_write.cpp os_win32.cpp)
+ add_library (d3d8 SHARED d3d8.def d3d8.cpp d3dshader.cpp trace_writer.cpp os_win32.cpp)
set_target_properties (d3d8
PROPERTIES PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
install (TARGETS d3d8 RUNTIME DESTINATION wrappers)
- endif (DirectX_D3D8_INCLUDE_DIR)
+ endif (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR)
# d3d9.dll
if (DirectX_D3DX9_INCLUDE_DIR)
add_custom_command (
OUTPUT d3d9.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9.cpp
- DEPENDS d3d9.py trace.py d3d9types.py d3d9caps.py d3dshader.py winapi.py stdapi.py
+ DEPENDS d3d9.py trace.py d3d9types.py d3d9caps.py winapi.py stdapi.py
)
- add_library (d3d9 SHARED d3d9.def d3d9.cpp trace_write.cpp os_win32.cpp)
+ add_library (d3d9 SHARED d3d9.def d3d9.cpp d3dshader.cpp trace_writer.cpp os_win32.cpp)
set_target_properties (d3d9
PROPERTIES PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
# COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10misc.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10.cpp
# DEPENDS d3d10misc.py winapi.py stdapi.py
# )
- # add_library (d3d10 SHARED d3d10.def d3d10.cpp trace_write.cpp os_win32.cpp)
+ # add_library (d3d10 SHARED d3d10.def d3d10.cpp trace_writer.cpp os_win32.cpp)
# set_target_properties (d3d10 PROPERTIES PREFIX "")
# install (TARGETS d3d10 RUNTIME DESTINATION wrappers)
#endif (DirectX_D3D10_INCLUDE_DIR)
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/wgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/wgltrace.cpp
DEPENDS wgltrace.py gltrace.py trace.py wglapi.py wglenum.py glapi.py glparams.py gltypes.py winapi.py stdapi.py
)
- add_library (wgltrace SHARED opengl32.def wgltrace.cpp trace_write.cpp os_win32.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+ add_library (wgltrace SHARED opengl32.def wgltrace.cpp trace_writer.cpp os_win32.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
set_target_properties (wgltrace PROPERTIES
PREFIX ""
OUTPUT_NAME opengl32
elseif (APPLE)
include_directories (${X11_INCLUDE_DIR})
- # libGL.dylib
+ # OpenGL framework
add_custom_command (
OUTPUT cgltrace.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/cgltrace.cpp
- DEPENDS cgltrace.py gltrace.py trace.py glxapi.py glapi.py glparams.py gltypes.py stdapi.py
+ DEPENDS cgltrace.py gltrace.py trace.py cglapi.py glapi.py glparams.py gltypes.py stdapi.py
)
- add_library (cgltrace SHARED cgltrace.cpp trace_write.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+ add_library (cgltrace SHARED cgltrace.cpp trace_writer.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
set_target_properties (cgltrace PROPERTIES
- # libGL.dylib
- OUTPUT_NAME GL
- # match the version
- LINK_FLAGS "-compatibility_version 1 -current_version 1.0.0"
+ # For
+ PREFIX "" OUTPUT_NAME "OpenGL" SUFFIX ""
+ # Specificy the version and reexport GLU symbols
+ LINK_FLAGS "-compatibility_version 1 -current_version 1.0.0 -Wl,-reexport_library,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
target_link_libraries (cgltrace dl)
- # Symbolic link from system's libGL.dylib
- add_custom_command (
- TARGET cgltrace
- COMMAND ln -sf /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib ${PROJECT_BINARY_DIR}/wrappers/libGL.system.dylib
- )
-
- install (TARGETS cgltrace LIBRARY DESTINATION lib)
+ install (TARGETS cgltrace LIBRARY DESTINATION wrappers)
else ()
include_directories (${X11_INCLUDE_DIR})
DEPENDS glxtrace.py gltrace.py trace.py glxapi.py glapi.py glparams.py gltypes.py stdapi.py
)
- add_library (glxtrace SHARED glxtrace.cpp trace_write.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+ add_library (glxtrace SHARED glxtrace.cpp trace_writer.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
set_target_properties (glxtrace PROPERTIES
# avoid the default "lib" prefix
)
add_custom_command (
- OUTPUT glretrace_state.cpp
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glstate.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_state.cpp
+ OUTPUT glstate_params.cpp
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glstate.py > ${CMAKE_CURRENT_BINARY_DIR}/glstate_params.cpp
DEPENDS glstate.py glparams.py gltypes.py stdapi.py
)
add_executable (glretrace
glretrace_gl.cpp
+ glretrace_cgl.cpp
glretrace_glx.cpp
glretrace_wgl.cpp
glretrace_main.cpp
- glretrace_state.cpp
+ glstate.cpp
+ glstate_params.cpp
retrace.cpp
${glws}
image.cpp
# We use GLX on MacOSX, which is in a separate library
if (APPLE)
find_library (X11_GL_LIB GL ${X11_LIB_SEARCH_PATH})
- target_link_libraries (glretrace ${X11_GL_LIB})
+ find_library (APPLICATIONSERVICES ApplicationServices)
+ target_link_libraries (glretrace ${X11_GL_LIB} ${APPLICATIONSERVICES})
endif (APPLE)
endif (NOT WIN32)
OUTPUT_VARIABLE CPACK_PACKAGE_VERSION_PATCH
)
+# See http://www.vtk.org/Wiki/CMake:CPackPackageGenerators
if (WIN32)
set (CPACK_GENERATOR "ZIP")
-else (WIN32)
+elseif (APPLE)
+ set (CPACK_GENERATOR "DragNDrop")
+else ()
set (CPACK_GENERATOR "TGZ")
-endif (WIN32)
+endif ()
include(CPack)