Changeset 1132 for code/branches/network2/src/util

Timestamp:

Apr 22, 2008, 4:25:54 PM (17 years ago)

Author:

scheusso

Message:

and here come the other files

Location:

code/branches/network2/src/util

Files:

• CMakeLists.txt (modified) (3 diffs)
• ExprParser.cc (copied) (copied from code/trunk/src/util/ExprParser.cc)
• ExprParser.h (copied) (copied from code/trunk/src/util/ExprParser.h)
• String.cc (modified) (1 diff)
• tolua (deleted)

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

@@ -1 +1 @@
 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
 
-SET (UTIL_SRC_FILES
+SET(UTIL_SRC_FILES
   ArgReader.cc
   Math.cc
@@ -7 +7 @@
   Clipboard.cc
   SubString.cc
+  ExprParser.cc
   MultiTypePrimitive.cc
   MultiTypeString.cc
   MultiTypeMath.cc
-  tolua/tolua_event.c
-  tolua/tolua_is.c
-  tolua/tolua_map.c
-  tolua/tolua_push.c
-  tolua/tolua_to.c
   ${TINYXML_SRC_FILES}
 )
 
-ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
+ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
 
 IF(TESTING_ENABLED)
@@ -24 +20 @@
 ENDIF(TESTING_ENABLED)
 
-TARGET_LINK_LIBRARIES( util
+TARGET_LINK_LIBRARIES(util
   ${OGRE_LIBRARIES}
-  ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
 ) 
 

code/branches/network2/src/util/String.cc

@@ -274 +274 @@
     if (str.size() == 0)
         return str;
+    else if (str.size() == 1)
+    {
+      //TODO: decide whether we need the commented code
+      /*if (str[0] != '\\')
+        return "";
+      else*/
+      return str;
+    }
 
     std::string output = "";