Put all common code in a subdirectory.

26 files changed, 17 insertions, 15 deletions

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
index 181e2d1..181e2d1 100644
--- a/formatter.hpp
+++ b/common/formatter.hpp
diff --git a/image.cpp b/common/image.cpp
index 4da9c13..4da9c13 100644
--- a/image.cpp
+++ b/common/image.cpp
diff --git a/image.hpp b/common/image.hpp
index dc53ec9..dc53ec9 100644
--- a/image.hpp
+++ b/common/image.hpp
diff --git a/image_bmp.cpp b/common/image_bmp.cpp
index 346f39a..346f39a 100644
--- a/image_bmp.cpp
+++ b/common/image_bmp.cpp
diff --git a/image_png.cpp b/common/image_png.cpp
index fd22213..fd22213 100644
--- a/image_png.cpp
+++ b/common/image_png.cpp
diff --git a/image_pnm.cpp b/common/image_pnm.cpp
index 5397a1a..5397a1a 100644
--- a/image_pnm.cpp
+++ b/common/image_pnm.cpp
diff --git a/json.hpp b/common/json.hpp
index 9e6b960..9e6b960 100644
--- a/json.hpp
+++ b/common/json.hpp
diff --git a/os.hpp b/common/os.hpp
index 8e487b5..8e487b5 100644
--- a/os.hpp
+++ b/common/os.hpp
diff --git a/os_posix.cpp b/common/os_posix.cpp
index 98a790b..98a790b 100644
--- a/os_posix.cpp
+++ b/common/os_posix.cpp
diff --git a/os_win32.cpp b/common/os_win32.cpp
index 587503c..587503c 100644
--- a/os_win32.cpp
+++ b/common/os_win32.cpp
diff --git a/trace_file.cpp b/common/trace_file.cpp
index f48c1aa..f48c1aa 100644
--- a/trace_file.cpp
+++ b/common/trace_file.cpp
diff --git a/trace_file.hpp b/common/trace_file.hpp
index 4b1b70d..4b1b70d 100644
--- a/trace_file.hpp
+++ b/common/trace_file.hpp
diff --git a/trace_format.hpp b/common/trace_format.hpp
index a8ee5eb..a8ee5eb 100644
--- a/trace_format.hpp
+++ b/common/trace_format.hpp
diff --git a/trace_loader.cpp b/common/trace_loader.cpp
index c14d815..c14d815 100644
--- a/trace_loader.cpp
+++ b/common/trace_loader.cpp
diff --git a/trace_loader.hpp b/common/trace_loader.hpp
index 9f74a9b..9f74a9b 100644
--- a/trace_loader.hpp
+++ b/common/trace_loader.hpp
diff --git a/trace_local_writer.cpp b/common/trace_local_writer.cpp
index ea6c111..ea6c111 100644
--- a/trace_local_writer.cpp
+++ b/common/trace_local_writer.cpp
diff --git a/trace_model.cpp b/common/trace_model.cpp
index 306b9e7..306b9e7 100644
--- a/trace_model.cpp
+++ b/common/trace_model.cpp
diff --git a/trace_model.hpp b/common/trace_model.hpp
index a74508e..a74508e 100644
--- a/trace_model.hpp
+++ b/common/trace_model.hpp
diff --git a/trace_model_writer.cpp b/common/trace_model_writer.cpp
index dcfcf86..dcfcf86 100644
--- a/trace_model_writer.cpp
+++ b/common/trace_model_writer.cpp
diff --git a/trace_parser.cpp b/common/trace_parser.cpp
index d7b20d2..d7b20d2 100644
--- a/trace_parser.cpp
+++ b/common/trace_parser.cpp
diff --git a/trace_parser.hpp b/common/trace_parser.hpp
index 3aaa6d3..3aaa6d3 100644
--- a/trace_parser.hpp
+++ b/common/trace_parser.hpp
diff --git a/trace_snappyfile.cpp b/common/trace_snappyfile.cpp
index 4dbe42d..4dbe42d 100644
--- a/trace_snappyfile.cpp
+++ b/common/trace_snappyfile.cpp
diff --git a/trace_snappyfile.hpp b/common/trace_snappyfile.hpp
index 33159ec..33159ec 100644
--- a/trace_snappyfile.hpp
+++ b/common/trace_snappyfile.hpp
diff --git a/trace_writer.cpp b/common/trace_writer.cpp
index 5a5f1f7..5a5f1f7 100644
--- a/trace_writer.cpp
+++ b/common/trace_writer.cpp
diff --git a/trace_writer.hpp b/common/trace_writer.hpp
index dfb76b2..dfb76b2 100644
--- a/trace_writer.hpp
+++ b/common/trace_writer.hpp