Changeset 1122 for code/branches/cmake/src/util
- Timestamp:
- Apr 21, 2008, 7:42:58 PM (17 years ago)
- Location:
- code/branches/cmake/src/util
- Files:
-
- 1 deleted
- 2 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cmake/src/util/CMakeLists.txt
r1085 r1122 1 1 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES) 2 2 3 SET 3 SET(UTIL_SRC_FILES 4 4 ArgReader.cc 5 5 Math.cc … … 7 7 Clipboard.cc 8 8 SubString.cc 9 ExprParser.cc 9 10 MultiTypePrimitive.cc 10 11 MultiTypeString.cc 11 12 MultiTypeMath.cc 12 tolua/tolua_event.c13 tolua/tolua_is.c14 tolua/tolua_map.c15 tolua/tolua_push.c16 tolua/tolua_to.c17 13 ${TINYXML_SRC_FILES} 18 14 ) 19 15 20 ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES})16 ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES}) 21 17 22 18 IF(TESTING_ENABLED) … … 24 20 ENDIF(TESTING_ENABLED) 25 21 26 TARGET_LINK_LIBRARIES( 22 TARGET_LINK_LIBRARIES(util 27 23 ${OGRE_LIBRARIES} 28 ${Lua_LIBRARIES}29 ${Lua_LIBRARY}30 24 ) 31 25 -
code/branches/cmake/src/util/String.cc
r1064 r1122 274 274 if (str.size() == 0) 275 275 return str; 276 else if (str.size() == 1) 277 { 278 //TODO: decide whether we need the commented code 279 /*if (str[0] != '\\') 280 return ""; 281 else*/ 282 return str; 283 } 276 284 277 285 std::string output = "";
Note: See TracChangeset
for help on using the changeset viewer.