Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 21, 2008, 7:42:58 PM (17 years ago)
Author:
rgrieder
Message:

merged trunk into cmake branch

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  
    11AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
    22
    3 SET (UTIL_SRC_FILES
     3SET(UTIL_SRC_FILES
    44  ArgReader.cc
    55  Math.cc
     
    77  Clipboard.cc
    88  SubString.cc
     9  ExprParser.cc
    910  MultiTypePrimitive.cc
    1011  MultiTypeString.cc
    1112  MultiTypeMath.cc
    12   tolua/tolua_event.c
    13   tolua/tolua_is.c
    14   tolua/tolua_map.c
    15   tolua/tolua_push.c
    16   tolua/tolua_to.c
    1713  ${TINYXML_SRC_FILES}
    1814)
    1915
    20 ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
     16ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
    2117
    2218IF(TESTING_ENABLED)
     
    2420ENDIF(TESTING_ENABLED)
    2521
    26 TARGET_LINK_LIBRARIES( util
     22TARGET_LINK_LIBRARIES(util
    2723  ${OGRE_LIBRARIES}
    28   ${Lua_LIBRARIES}
    29   ${Lua_LIBRARY}
    3024)
    3125
  • code/branches/cmake/src/util/String.cc

    r1064 r1122  
    274274    if (str.size() == 0)
    275275        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    }
    276284
    277285    std::string output = "";
Note: See TracChangeset for help on using the changeset viewer.