Changeset 871 for code/trunk/src/util/CMakeLists.txt

Timestamp:

Mar 9, 2008, 4:44:36 PM (17 years ago)

Author:

landauf

Message:

merged core branch to trunk

File:

• code/trunk/src/util/CMakeLists.txt (modified) (1 diff)

code/trunk/src/util/CMakeLists.txt

@@ -4 +4 @@
 
 SET (UTIL_SRC_FILES
+  Math.cc
+  String.cc
+  SubString.cc
+  MultiTypePrimitive.cc
+  MultiTypeString.cc
+  MultiTypeMath.cc
   ${TINYXML_SRC_FILES}
-  substring.cc
 )
 
-IF(WIN32)
-  ADD_LIBRARY( util ${UTIL_SRC_FILES} )
-ELSE(WIN32)
-  ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
-ENDIF(WIN32)
+ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
 SET_TARGET_PROPERTIES( util PROPERTIES LINK_FLAGS "--no-undefined" )
-
 
 IF(TESTING_ENABLED)
   ADD_SUBDIRECTORY(testing)
 ENDIF(TESTING_ENABLED)
+
+TARGET_LINK_LIBRARIES( util
+  ${OGRE_LIBRARIES}
+)