Changeset 1211 for code/branches/camera/src/util

Timestamp:

May 1, 2008, 6:09:05 PM (17 years ago)

Author:

scheusso

Message:

merged trunk changes from 1101 to 1202 into camera branch

Location:

code/branches/camera/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/CMakeLists.txt (modified) (2 diffs)

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

@@ -1 @@
-AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
-
-SET (UTIL_SRC_FILES
+SET(UTIL_SRC_FILES
   ArgReader.cc
+  Clipboard.cc
+  ExprParser.cc
   Math.cc
-  String.cc
-  Clipboard.cc
-  SubString.cc
   MultiTypePrimitive.cc
   MultiTypeString.cc
   MultiTypeMath.cc
+  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
@@ -15 +21 @@
   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 +29 @@
 ENDIF(TESTING_ENABLED)
 
-TARGET_LINK_LIBRARIES( util
+TARGET_LINK_LIBRARIES(util
   ${OGRE_LIBRARIES}
   ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
 ) 
 
+ADD_SUBDIRECTORY(tolua)
+

code/branches/camera/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 = "";

code/branches/camera/src/util/tolua/CMakeLists.txt

@@ -1 @@
-PROJECT(ToLua)
-
-#This sets where to look for modules (e.g. "Find*.cmake" files)
-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/)
-
-#Check whether we are on a tardis box
-INCLUDE(CheckTardis)
-
-########## Compiler/Linker options ##############
-
-# if on tardis change compiler and reset boost include directory
-IF(IS_TARDIS)
-  MESSAGE("System is a TARDIS: Setting Compiler to g++-4.1.1")
-  # force-set the compiler on tardis machines, as default points to g++-3.3
-  SET(CMAKE_CXX_COMPILER "g++-4.1.1")
-ENDIF(IS_TARDIS)
-
-#set binary output directories
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/../../../bin)
-SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/../../../bin)
-
-# global compiler/linker flags. force -O2!
-SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O2 -Wall -g -ggdb")
-SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O2 -Wall -g -ggdb")
-SET(CMAKE_LD_FLAGS "$ENV{LDFLAGS}")
-SET(CMAKE_EXE_LINKER_FLAGS " --no-undefined")
-SET(CMAKE_SHARED_LINKER_FLAGS " --no-undefined")
-SET(CMAKE_MODULE_LINKER_FLAGS " --no-undefined")
-
-#Create verbose makefile output when compiling
-SET(CMAKE_VERBOSE_MAKEFILE TRUE)
-
-
-############### Library finding #################
-
-#Performs the search and sets the variables
-FIND_PACKAGE(Lua)
-
-#Set the search paths for the linking
-LINK_DIRECTORIES(
-)
-
-#Set the search paths for include files
-INCLUDE_DIRECTORIES(
-  ${Lua_INCLUDE_DIR}
-)
-
-
-################ Source files ###################
-
-SET (TOLUA_SRC_FILES
+SET(TOLUA_SRC_FILES
   tolua.c
   tolua_event.c
@@ -59 +9 @@
 )
 
-ADD_EXECUTABLE( tolua ${TOLUA_SRC_FILES} )
+ADD_EXECUTABLE(tolua ${TOLUA_SRC_FILES})
 
-TARGET_LINK_LIBRARIES( tolua
+TARGET_LINK_LIBRARIES(tolua
   ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
   m
 )
+