Changeset 1127 for code/branches/cmake/src/util

Timestamp:

Apr 22, 2008, 1:37:42 PM (17 years ago)

Author:

rgrieder

Message:

• tolua_bind.cc and Script.cc depended on each other, but were not in the same library. gcc doesn't care anyway, vc++ didn't too because I linked statically. However: Circular dependencies are not very good. New approach: every lib has its own tolua_bind.cc file I've added this for orxonox and core.

fabian: Is it possible, that under certain conditions, you need the SET_TARGET_PROPERTIES?

On tardis, things work very well without it. But what about cmake under windows?

I'll readd it, if required.

File:

• code/branches/cmake/src/util/CMakeLists.txt (modified) (2 diffs)

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

@@ -1 @@
-AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
-
 SET(UTIL_SRC_FILES
   ArgReader.cc
+  Clipboard.cc
+  ExprParser.cc
   Math.cc
-  String.cc
-  Clipboard.cc
-  SubString.cc
-  ExprParser.cc
   MultiTypePrimitive.cc
   MultiTypeString.cc
   MultiTypeMath.cc
-  ${TINYXML_SRC_FILES}
+  String.cc
+  SubString.cc
+
+  tinyxml/ticpp.cc
+  tinyxml/tinystr.cc
+  tinyxml/tinyxml.cc
+  tinyxml/tinyxmlerror.cc
+  tinyxml/tinyxmlparser.cc
+
+  tolua/tolua_event.c
+  tolua/tolua_is.c
+  tolua/tolua_map.c
+  tolua/tolua_push.c
+  tolua/tolua_to.c
 )
 
@@ -22 +31 @@
 TARGET_LINK_LIBRARIES(util
   ${OGRE_LIBRARIES}
+  ${Lua_LIBRARIES}
 ) 
 
+ADD_SUBDIRECTORY(tolua)
+