Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1645


Ignore:
Timestamp:
Jul 23, 2008, 7:31:40 PM (16 years ago)
Author:
rgrieder
Message:

It compiles now on tardis..

Location:
code/branches/gui
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • code/branches/gui/CMakeLists.txt

    r1643 r1645  
    5454
    5555#use 'cmake -D make_verb:1 path' to get verbose make output when compiling
    56 IF (MAKE_VERB)
     56#IF (MAKE_VERB)
    5757 SET(CMAKE_VERBOSE_MAKEFILE TRUE)
    58 ENDIF (MAKE_VERB)
     58#ENDIF (MAKE_VERB)
    5959
    6060

  • code/branches/gui/cmake/FindCEGUI.cmake

    r1505 r1645  
    3939SET(CEGUI_INCLUDE_DIR ${CEGUI_INCLUDE_DIR} CACHE PATH "")
    4040SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
     41SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule" CACHE STRING "")
    4142SET(CEGUI_LIB_DIR ${CEGUI_LIB_DIR} CACHE PATH "")
    4243

  • code/branches/gui/src/core/CMakeLists.txt

    r1638 r1645  
    5757ADD_CUSTOM_COMMAND(
    5858  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
    59   COMMAND ${TOLUA_EXE} -n core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
     59  COMMAND ${TOLUA_EXE} -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
    6060  DEPENDS tolua
    6161  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib

  • code/branches/gui/src/core/Exception.h

    r1642 r1645  
    100100        }
    101101
    102         ~SpecificException() { }
     102        ~SpecificException() throw() { }
    103103
    104104        ExceptionType getType() const { return Type; }
    … …  
    133133#ifndef NDEBUG
    134134#define OrxAssert(condition, errorMessage) \
    135     condition ? ((void)0) : (orxonox::OutputHandler::getOutStream().setOutputLevel(ORX_ERROR) << errorMessage << std::endl); \
    136     assert(condition);
     135    condition ? ((void)0) : (void)(orxonox::OutputHandler::getOutStream().setOutputLevel(ORX_ERROR) << errorMessage << std::endl); \
     136    assert(condition)
    137137#else
    138138#define OrxAssert(condition, errorMessage)  ((void)0)

  • code/branches/gui/src/core/input/InputManager.cc

    r1642 r1645  
    8686        , stateCalibrator_(0)
    8787        , stateEmpty_(0)
     88        , bCalibrating_(false)
    8889        , keyboardModifiers_(0)
    89         , bCalibrating_(false)
    9090    {
    9191        RegisterRootObject(InputManager);

  • code/branches/gui/src/core/input/InputManager.h

    r1642 r1645  
    8585    {
    8686        // --> setConfigValues is private
    87         friend ClassIdentifier<InputManager>;
     87        friend class ClassIdentifier<InputManager>;
    8888        // let Core class use tick(.)
    89         friend Core;
     89        friend class Core;
    9090
    9191    public:

  • code/branches/gui/src/orxonox/CMakeLists.txt

    r1643 r1645  
    5959ADD_CUSTOM_COMMAND(
    6060  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
    61   COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
     61  COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
    6262  DEPENDS tolua
    6363  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
    … …  
    8989  ${Lua_LIBRARIES}
    9090  ${CEGUI_LIBRARIES}
     91  ${CEGUI_SCRIPT_LIBRARIES}
    9192  tinyxml
    9293  tolualib

  • code/branches/gui/src/orxonox/Orxonox.cc

    r1642 r1645  
    468468    unsigned long frameCount = 0;
    469469   
    470     const unsigned long refreshTime = 50000.0f;
    471     //const unsigned long refreshTime = debugRefreshTime_ * 1000000.0f;
     470    const unsigned long refreshTime = (unsigned long)(debugRefreshTime_ * 1000000.0f);
    472471    unsigned long refreshStartTime = 0;
    473472    unsigned long tickTime = 0;

  • code/branches/gui/src/orxonox/gui/GUIManager.cc

    r1642 r1645  
    126126            catch (CEGUI::Exception& ex)
    127127            {
     128#if CEGUI_VERSION_MINOR < 6
     129                throw GeneralException(ex.getMessage().c_str());
     130#else
    128131                throw GeneralException(ex.getMessage().c_str(), ex.getLine(),
    129132                    ex.getFileName().c_str(), ex.getName().c_str());
     133#endif
    130134            }
    131135
    … …  
    166170        catch (CEGUI::Exception& ex)
    167171        {
     172#if CEGUI_VERSION_MINOR < 6
     173            throw GeneralException(ex.getMessage().c_str());
     174#else
    168175            throw GeneralException(ex.getMessage().c_str(), ex.getLine(),
    169176                ex.getFileName().c_str(), ex.getName().c_str());
     177#endif
    170178        }
    171179    }
Note: See TracChangeset for help on using the changeset viewer.