From a8c164caecc408462d3e4c1626c87ab9974f6a48 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 21 Sep 2011 07:46:50 +0100 Subject: [PATCH] Put all common code in a subdirectory. --- CMakeLists.txt | 32 ++++++++++--------- formatter.hpp => common/formatter.hpp | 0 image.cpp => common/image.cpp | 0 image.hpp => common/image.hpp | 0 image_bmp.cpp => common/image_bmp.cpp | 0 image_png.cpp => common/image_png.cpp | 0 image_pnm.cpp => common/image_pnm.cpp | 0 json.hpp => common/json.hpp | 0 os.hpp => common/os.hpp | 0 os_posix.cpp => common/os_posix.cpp | 0 os_win32.cpp => common/os_win32.cpp | 0 trace_file.cpp => common/trace_file.cpp | 0 trace_file.hpp => common/trace_file.hpp | 0 trace_format.hpp => common/trace_format.hpp | 0 trace_loader.cpp => common/trace_loader.cpp | 0 trace_loader.hpp => common/trace_loader.hpp | 0 .../trace_local_writer.cpp | 0 trace_model.cpp => common/trace_model.cpp | 0 trace_model.hpp => common/trace_model.hpp | 0 .../trace_model_writer.cpp | 0 trace_parser.cpp => common/trace_parser.cpp | 0 trace_parser.hpp => common/trace_parser.hpp | 0 .../trace_snappyfile.cpp | 0 .../trace_snappyfile.hpp | 0 trace_writer.cpp => common/trace_writer.cpp | 0 trace_writer.hpp => common/trace_writer.hpp | 0 26 files changed, 17 insertions(+), 15 deletions(-) rename formatter.hpp => common/formatter.hpp (100%) rename image.cpp => common/image.cpp (100%) rename image.hpp => common/image.hpp (100%) rename image_bmp.cpp => common/image_bmp.cpp (100%) rename image_png.cpp => common/image_png.cpp (100%) rename image_pnm.cpp => common/image_pnm.cpp (100%) rename json.hpp => common/json.hpp (100%) rename os.hpp => common/os.hpp (100%) rename os_posix.cpp => common/os_posix.cpp (100%) rename os_win32.cpp => common/os_win32.cpp (100%) rename trace_file.cpp => common/trace_file.cpp (100%) rename trace_file.hpp => common/trace_file.hpp (100%) rename trace_format.hpp => common/trace_format.hpp (100%) rename trace_loader.cpp => common/trace_loader.cpp (100%) rename trace_loader.hpp => common/trace_loader.hpp (100%) rename trace_local_writer.cpp => common/trace_local_writer.cpp (100%) rename trace_model.cpp => common/trace_model.cpp (100%) rename trace_model.hpp => common/trace_model.hpp (100%) rename trace_model_writer.cpp => common/trace_model_writer.cpp (100%) rename trace_parser.cpp => common/trace_parser.cpp (100%) rename trace_parser.hpp => common/trace_parser.hpp (100%) rename trace_snappyfile.cpp => common/trace_snappyfile.cpp (100%) rename trace_snappyfile.hpp => common/trace_snappyfile.hpp (100%) rename trace_writer.cpp => common/trace_writer.cpp (100%) rename trace_writer.hpp => common/trace_writer.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c91c90..360e830 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,10 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) ############################################################################## # Common libraries / utilities -include_directories (${CMAKE_CURRENT_SOURCE_DIR}) +include_directories ( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/common +) add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp @@ -180,19 +183,19 @@ else (WIN32) endif (WIN32) add_library (common - trace_file.cpp - trace_snappyfile.cpp - trace_model.cpp - trace_parser.cpp - trace_writer.cpp - trace_local_writer.cpp - trace_model_writer.cpp - trace_loader.cpp - image.cpp - image_bmp.cpp - image_pnm.cpp - image_png.cpp - ${os} + common/trace_file.cpp + common/trace_snappyfile.cpp + common/trace_model.cpp + common/trace_parser.cpp + common/trace_writer.cpp + common/trace_local_writer.cpp + common/trace_model_writer.cpp + common/trace_loader.cpp + common/image.cpp + common/image_bmp.cpp + common/image_pnm.cpp + common/image_png.cpp + common/${os} ) set_target_properties (common PROPERTIES @@ -383,7 +386,6 @@ add_executable (glretrace glstate_params.cpp retrace.cpp ${glws} - image.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) diff --git a/formatter.hpp b/common/formatter.hpp similarity index 100% rename from formatter.hpp rename to common/formatter.hpp diff --git a/image.cpp b/common/image.cpp similarity index 100% rename from image.cpp rename to common/image.cpp diff --git a/image.hpp b/common/image.hpp similarity index 100% rename from image.hpp rename to common/image.hpp diff --git a/image_bmp.cpp b/common/image_bmp.cpp similarity index 100% rename from image_bmp.cpp rename to common/image_bmp.cpp diff --git a/image_png.cpp b/common/image_png.cpp similarity index 100% rename from image_png.cpp rename to common/image_png.cpp diff --git a/image_pnm.cpp b/common/image_pnm.cpp similarity index 100% rename from image_pnm.cpp rename to common/image_pnm.cpp diff --git a/json.hpp b/common/json.hpp similarity index 100% rename from json.hpp rename to common/json.hpp diff --git a/os.hpp b/common/os.hpp similarity index 100% rename from os.hpp rename to common/os.hpp diff --git a/os_posix.cpp b/common/os_posix.cpp similarity index 100% rename from os_posix.cpp rename to common/os_posix.cpp diff --git a/os_win32.cpp b/common/os_win32.cpp similarity index 100% rename from os_win32.cpp rename to common/os_win32.cpp diff --git a/trace_file.cpp b/common/trace_file.cpp similarity index 100% rename from trace_file.cpp rename to common/trace_file.cpp diff --git a/trace_file.hpp b/common/trace_file.hpp similarity index 100% rename from trace_file.hpp rename to common/trace_file.hpp diff --git a/trace_format.hpp b/common/trace_format.hpp similarity index 100% rename from trace_format.hpp rename to common/trace_format.hpp diff --git a/trace_loader.cpp b/common/trace_loader.cpp similarity index 100% rename from trace_loader.cpp rename to common/trace_loader.cpp diff --git a/trace_loader.hpp b/common/trace_loader.hpp similarity index 100% rename from trace_loader.hpp rename to common/trace_loader.hpp diff --git a/trace_local_writer.cpp b/common/trace_local_writer.cpp similarity index 100% rename from trace_local_writer.cpp rename to common/trace_local_writer.cpp diff --git a/trace_model.cpp b/common/trace_model.cpp similarity index 100% rename from trace_model.cpp rename to common/trace_model.cpp diff --git a/trace_model.hpp b/common/trace_model.hpp similarity index 100% rename from trace_model.hpp rename to common/trace_model.hpp diff --git a/trace_model_writer.cpp b/common/trace_model_writer.cpp similarity index 100% rename from trace_model_writer.cpp rename to common/trace_model_writer.cpp diff --git a/trace_parser.cpp b/common/trace_parser.cpp similarity index 100% rename from trace_parser.cpp rename to common/trace_parser.cpp diff --git a/trace_parser.hpp b/common/trace_parser.hpp similarity index 100% rename from trace_parser.hpp rename to common/trace_parser.hpp diff --git a/trace_snappyfile.cpp b/common/trace_snappyfile.cpp similarity index 100% rename from trace_snappyfile.cpp rename to common/trace_snappyfile.cpp diff --git a/trace_snappyfile.hpp b/common/trace_snappyfile.hpp similarity index 100% rename from trace_snappyfile.hpp rename to common/trace_snappyfile.hpp diff --git a/trace_writer.cpp b/common/trace_writer.cpp similarity index 100% rename from trace_writer.cpp rename to common/trace_writer.cpp diff --git a/trace_writer.hpp b/common/trace_writer.hpp similarity index 100% rename from trace_writer.hpp rename to common/trace_writer.hpp -- 2.43.0