From 9ed672278e79600c4c7ad34a715ecfc4beda9255 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Tue, 24 May 2011 08:42:59 +0100 Subject: [PATCH] trace_write -> trace_writer --- CMakeLists.txt | 14 +++++++------- cgltrace.py | 2 +- d3d10_1.py | 2 +- d3d10misc.py | 2 +- d3d8.py | 2 +- d3d9.py | 2 +- d3dshader.cpp | 2 +- ddraw.py | 2 +- glxtrace.py | 2 +- gui/saverthread.cpp | 2 +- trace_write.cpp => trace_writer.cpp | 2 +- trace_write.hpp => trace_writer.hpp | 6 +++--- wgltrace.py | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) rename trace_write.cpp => trace_writer.cpp (99%) rename trace_write.hpp => trace_writer.hpp (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f0a83a..7b37075 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,7 @@ else (WIN32) 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 ${os}) add_executable (tracedump tracedump.cpp) target_link_libraries (tracedump trace) @@ -180,7 +180,7 @@ if (WIN32) COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8.cpp DEPENDS d3d8.py trace.py d3d8types.py d3d8caps.py winapi.py stdapi.py ) - add_library (d3d8 SHARED d3d8.def d3d8.cpp d3dshader.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 @@ -197,7 +197,7 @@ if (WIN32) COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9.cpp DEPENDS d3d9.py trace.py d3d9types.py d3d9caps.py winapi.py stdapi.py ) - add_library (d3d9 SHARED d3d9.def d3d9.cpp d3dshader.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 @@ -214,7 +214,7 @@ if (WIN32) # 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) @@ -225,7 +225,7 @@ if (WIN32) 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 @@ -247,7 +247,7 @@ elseif (APPLE) DEPENDS cgltrace.py gltrace.py trace.py glxapi.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 @@ -277,7 +277,7 @@ else () 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 diff --git a/cgltrace.py b/cgltrace.py index 33765f9..f850435 100644 --- a/cgltrace.py +++ b/cgltrace.py @@ -50,7 +50,7 @@ if __name__ == '__main__': print '#endif' print '#include ' print - print '#include "trace_write.hpp"' + print '#include "trace_writer.hpp"' print print '// To validate our prototypes' print '#define GL_GLEXT_PROTOTYPES' diff --git a/d3d10_1.py b/d3d10_1.py index c71e880..ebf2896 100644 --- a/d3d10_1.py +++ b/d3d10_1.py @@ -72,6 +72,6 @@ if __name__ == '__main__': print print '#include ' print - print '#include "trace_write.hpp"' + print '#include "trace_writer.hpp"' print wrap() diff --git a/d3d10misc.py b/d3d10misc.py index 00bd0e9..4553f19 100644 --- a/d3d10misc.py +++ b/d3d10misc.py @@ -64,6 +64,6 @@ if __name__ == '__main__': print print '#include ' print - print '#include "trace_write.hpp"' + print '#include "trace_writer.hpp"' print wrap() diff --git a/d3d8.py b/d3d8.py index 07ddc47..970b9c3 100644 --- a/d3d8.py +++ b/d3d8.py @@ -296,7 +296,7 @@ if __name__ == '__main__': print '#include ' print '#include "d3dshader.hpp"' print - print '#include "trace_write.hpp"' + print '#include "trace_writer.hpp"' print '#include "os.hpp"' print tracer = D3D8Tracer('d3d8.dll') diff --git a/d3d9.py b/d3d9.py index e2d5ba6..8140162 100644 --- a/d3d9.py +++ b/d3d9.py @@ -465,7 +465,7 @@ if __name__ == '__main__': print '#include "d3d9imports.hpp"' print '#include "d3dshader.hpp"' print - print '#include "trace_write.hpp"' + print '#include "trace_writer.hpp"' print '#include "os.hpp"' print tracer = D3D9Tracer('d3d9.dll') diff --git a/d3dshader.cpp b/d3dshader.cpp index 799b35f..97f5d42 100644 --- a/d3dshader.cpp +++ b/d3dshader.cpp @@ -27,7 +27,7 @@ #include -#include "trace_write.hpp" +#include "trace_writer.hpp" #include "d3d9imports.hpp" #include "d3dshader.hpp" diff --git a/ddraw.py b/ddraw.py index 0841a8a..cc585ec 100644 --- a/ddraw.py +++ b/ddraw.py @@ -1619,6 +1619,6 @@ if __name__ == '__main__': print '#include ' print '#include ' print - print '#include "trace_write.hpp"' + print '#include "trace_writer.hpp"' print wrap() diff --git a/glxtrace.py b/glxtrace.py index b3c1b4f..dfc24df 100644 --- a/glxtrace.py +++ b/glxtrace.py @@ -58,7 +58,7 @@ if __name__ == '__main__': print '#endif' print '#include ' print - print '#include "trace_write.hpp"' + print '#include "trace_writer.hpp"' print print '// To validate our prototypes' print '#define GL_GLEXT_PROTOTYPES' diff --git a/gui/saverthread.cpp b/gui/saverthread.cpp index b16a770..fe0f9a6 100644 --- a/gui/saverthread.cpp +++ b/gui/saverthread.cpp @@ -1,6 +1,6 @@ #include "saverthread.h" -#include "trace_write.hpp" +#include "trace_writer.hpp" #include #include diff --git a/trace_write.cpp b/trace_writer.cpp similarity index 99% rename from trace_write.cpp rename to trace_writer.cpp index 4dfba8a..a97cef2 100644 --- a/trace_write.cpp +++ b/trace_writer.cpp @@ -35,7 +35,7 @@ #include #include "os.hpp" -#include "trace_write.hpp" +#include "trace_writer.hpp" #include "trace_format.hpp" diff --git a/trace_write.hpp b/trace_writer.hpp similarity index 97% rename from trace_write.hpp rename to trace_writer.hpp index 8797e56..d41acde 100644 --- a/trace_write.hpp +++ b/trace_writer.hpp @@ -27,8 +27,8 @@ * Trace writing functions. */ -#ifndef _TRACE_WRITE_HPP_ -#define _TRACE_WRITE_HPP_ +#ifndef _TRACE_WRITER_HPP_ +#define _TRACE_WRITER_HPP_ #include @@ -108,4 +108,4 @@ namespace Trace { void Abort(void); } -#endif /* _TRACE_WRITE_HPP_ */ +#endif /* _TRACE_WRITER_HPP_ */ diff --git a/wgltrace.py b/wgltrace.py index 028580d..ea4474d 100644 --- a/wgltrace.py +++ b/wgltrace.py @@ -66,7 +66,7 @@ if __name__ == '__main__': print '#include ' print '#include ' print - print '#include "trace_write.hpp"' + print '#include "trace_writer.hpp"' print '#include "os.hpp"' print print ''' -- 2.43.0