Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2728 for code/trunk


Ignore:
Timestamp:
Mar 2, 2009, 1:47:42 PM (16 years ago)
Author:
rgrieder
Message:

Updated to the new tardis libraries. Seems to work fine.

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/LibraryConfigTardis.cmake

    r2710 r2728  
    3535  MESSAGE(STATUS "Running on D-ITET isg.ee Tardis Computer. Using customized paths.")
    3636
    37   # We cannot use the default compiler (why?)
    38   SET(CMAKE_C_COMPILER "gcc-4.1")
    39   SET(CMAKE_CXX_COMPILER "g++-4.1")
    40 
    4137  # Note: When setting ENV${} variables, make sure to use quotes when
    4238  #       having multiple directories.
    43   SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.34.1-sd/include")
    44   SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/lib")
    45   SET(ENV{CEGUIDIR}    "/usr/pack/cegui-0.5.0-sd;/usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1")
    46   SET(ENV{ENETDIR}     "/usr/pack/enet-2007-sd;/usr/pack/enet-2007-sd/i686-debian-linux3.1")
     39  SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.36.0-sd/include/boost-1_36")
     40  SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.36.0-sd/i686-debian-linux4.0/lib")
     41  SET(ENV{CEGUIDIR}    "/usr/pack/cegui-0.6.2-sd;/usr/pack/cegui-0.6.2-sd/i686-debian-linux4.0")
     42  SET(ENV{ENETDIR}     "/usr/pack/enet-1.2-sd;/usr/pack/enet-1.2-sd/i686-debian-linux4.0")
    4743  SET(ENV{ALUTDIR}     "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
    4844  SET(ENV{OGGDIR}      "/usr/pack/oggvorbis-1.0-ds;/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0")
    4945  SET(ENV{VORBISDIR}   "/usr/pack/oggvorbis-1.0-ds;/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0")
    50   SET(ENV{LUA_DIR}     "/usr/pack/lua-5.0.3-sd;/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1")
    51   SET(ENV{OGRE_HOME}   "/usr/pack/ogre-1.4.5-sd;/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1")
     46  SET(ENV{LUA_DIR}     "/usr/pack/lua-5.1.4-sd;/usr/pack/lua-5.1.4-sd/i686-debian-linux4.0")
     47  SET(ENV{OGRE_HOME}   "/usr/pack/ogre-1.4.9-sd;/usr/pack/ogre-1.4.9-sd/i686-debian-linux4.0")
    5248  SET(ENV{OPENALDIR}   "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
    5349  #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
  • code/trunk/src/core/ArgumentCompletionFunctions.cc

    r2710 r2728  
    3131#include <iostream>
    3232#include <map>
     33#include <boost/version.hpp>
    3334#include <boost/filesystem.hpp>
    3435
     
    3940#include "util/Convert.h"
    4041#include "util/String.h"
     42
     43// Boost 1.36 has some issues with deprecated functions that have been omitted
     44#if (BOOST_VERSION == 103600)
     45#  define BOOST_LEAF_FUNCTION filename
     46#else
     47#  define BOOST_LEAF_FUNCTION leaf
     48#endif
    4149
    4250namespace orxonox
     
    7886                {
    7987                    if (boost::filesystem::is_directory(*file))
    80                         dirlist.push_back(ArgumentCompletionListElement((*file).string() + CP_SLASH, getLowercase((*file).string()) + "/", (*file).leaf() + "/"));
     88                        dirlist.push_back(ArgumentCompletionListElement((*file).string() + CP_SLASH, getLowercase((*file).string()) + "/", (*file).BOOST_LEAF_FUNCTION() + "/"));
    8189                    else
    82                         filelist.push_back(ArgumentCompletionListElement((*file).string(), getLowercase((*file).string()), (*file).leaf()));
     90                        filelist.push_back(ArgumentCompletionListElement((*file).string(), getLowercase((*file).string()), (*file).BOOST_LEAF_FUNCTION()));
    8391                    ++file;
    8492                }
Note: See TracChangeset for help on using the changeset viewer.