Changeset 744

Timestamp:

Dec 31, 2007, 4:36:19 AM (17 years ago)

Author:

landauf

Message:

• changed CML files: xml library is now util library and is open for more files
• added substring class from orxonox v1, linked to the new util library

Location:

code/branches/FICN/src

Files:

• loader/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)
• util/substring.cc (added)
• util/substring.h (added)

code/branches/FICN/src/loader/CMakeLists.txt

@@ -13 +13 @@
 
 TARGET_LINK_LIBRARIES( loader
-  xml
+  util
 )

code/branches/FICN/src/orxonox/CMakeLists.txt

@@ -65 +65 @@
   hud
   ${LINK_OBJECTS_LIBRARY}
-  xml
+  util
   particle
 )

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -30 +30 @@
 
 TARGET_LINK_LIBRARIES( objects
-  xml
+  util
   orxonox
 )

code/branches/FICN/src/util/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-ADD_SUBDIRECTORY(tinyxml)
+PROJECT(Orxonox)
+
+INCLUDE_DIRECTORIES(tinyxml)
+
+SET (SRC_FILES
+  tinyxml/tinystr.cc
+  tinyxml/tinyxml.cc
+  tinyxml/tinyxmlerror.cc
+  tinyxml/tinyxmlparser.cc
+  tinyxml/ticpp.cc
+  substring.cc
+)
+
+IF(WIN32)
+  ADD_LIBRARY(util ${SRC_FILES})
+ELSE(WIN32)
+  ADD_LIBRARY(util SHARED ${SRC_FILES})
+ENDIF(WIN32)
+
+
 
 IF(TESTING_ENABLED)