Move Trace::Parser::version to .cpp to avoid duplicate symbols.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53d406e2050c0a5d5abfe9b8780f937a90591ca9..598bc18ad2bdece4b09f830a9d8f2038b520a634 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -193,14 +193,17 @@ else ()
     target_link_libraries (glxtrace dl)
 endif ()
 
-add_executable (dump dump.cpp trace_model.cpp)
-
 if (WIN32)
     set (os os_win32.cpp)
 else (WIN32)
     set (os os_posix.cpp)
 endif (WIN32)
 
+add_library (trace trace_model.cpp trace_parser.cpp ${os})
+
+add_executable (dump dump.cpp)
+target_link_libraries (dump trace)
+
 if (GLUT_INCLUDE_DIR)
     add_custom_command (
         OUTPUT glretrace.cpp
@@ -214,9 +217,10 @@ if (GLUT_INCLUDE_DIR)
         ${GLUT_INCLUDE_DIR}
     )
 
-    add_executable (glretrace glretrace.cpp trace_model.cpp image.cpp ${os} ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+    add_executable (glretrace glretrace.cpp image.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
 
     target_link_libraries (glretrace
+        trace
         ${OPENGL_gl_LIBRARY}
         ${OPENGL_glu_LIBRARY}
         ${GLUT_glut_LIBRARY}

diff --git a/trace_parser.cpp b/trace_parser.cpp
new file mode 100644 (file)
index 0000000..e3021e9
--- /dev/null
+++ b/trace_parser.cpp
@@ -0,0 +1,37 @@
+/**************************************************************************
+ *
+ * Copyright 2011 Jose Fonseca
+ * Copyright 2010 VMware, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ **************************************************************************/
+
+
+#include "trace_parser.hpp"
+
+
+namespace Trace {
+
+
+unsigned long long Trace::Parser::version = 0;
+
+
+} /* namespace Trace */

diff --git a/trace_parser.hpp b/trace_parser.hpp
index f008fb993401ec9cdbad4b7c8a97835fdeb88017..edd968510bb969769e629650cbfcf8ed9acbb86d 100644 (file)
--- a/trace_parser.hpp
+++ b/trace_parser.hpp
@@ -400,9 +400,6 @@ public:
 };
 
 
-unsigned long long Trace::Parser::version = 0;
-
-
 } /* namespace Trace */
 
 #endif /* _TRACE_PARSER_HPP_ */