Changeset 1153 for code/trunk/src/util

Timestamp:

Apr 24, 2008, 10:35:53 AM (16 years ago)

Author:

rgrieder

Message:

• merged cmake branch back to trunk (the last one, hopefully )
• added Oli's lua library name (liblua.so)

Location:

code/trunk/src/util

Files:

• CMakeLists.txt (modified) (2 diffs)
• tolua (copied) (copied from code/branches/cmake/src/util/tolua)
• tolua/CMakeLists.txt (copied) (copied from code/branches/cmake/src/util/tolua/CMakeLists.txt)
• tolua/tolua++.h (copied) (copied from code/branches/cmake/src/util/tolua/tolua++.h)
• tolua/tolua.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua.c)
• tolua/tolua_bind.cc (copied) (copied from code/branches/cmake/src/util/tolua/tolua_bind.cc)
• tolua/tolua_bind.h (copied) (copied from code/branches/cmake/src/util/tolua/tolua_bind.h)
• tolua/tolua_event.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua_event.c)
• tolua/tolua_event.h (copied) (copied from code/branches/cmake/src/util/tolua/tolua_event.h)
• tolua/tolua_is.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua_is.c)
• tolua/tolua_map.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua_map.c)
• tolua/tolua_push.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua_push.c)
• tolua/tolua_to.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua_to.c)
• tolua/toluabind.c (copied) (copied from code/branches/cmake/src/util/tolua/toluabind.c)
• tolua/toluabind.h (copied) (copied from code/branches/cmake/src/util/tolua/toluabind.h)
• tolua/toluabind_default.h (copied) (copied from code/branches/cmake/src/util/tolua/toluabind_default.h)

code/trunk/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)
+