Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 24, 2009, 11:02:42 AM (15 years ago)
Author:
rgrieder
Message:

Reverted trunk again. We might want to find a way to delete these revisions again (x3n's changes are still available as diff in the commit mails).

Location:
code/trunk/src/orxonox
Files:
2 deleted
3 edited
208 copied

Legend:

Unmodified
Added
Removed

  • code/trunk/src/orxonox/CMakeLists.txt

    r5774 r5781  
    2626SET_SOURCE_FILES(ORXONOX_SRC_FILES
    2727  Main.cc
    28   GSRoot.cc
     28
     29  CameraManager.cc
     30  LevelManager.cc
     31  PawnManager.cc
     32  PlayerManager.cc
     33
     34  Level.cc
     35  Radar.cc
     36  Scene.cc
    2937)
     38
     39ADD_SUBDIRECTORY(collisionshapes)
     40ADD_SUBDIRECTORY(controllers)
     41ADD_SUBDIRECTORY(gametypes)
     42ADD_SUBDIRECTORY(graphics)
     43ADD_SUBDIRECTORY(infos)
     44ADD_SUBDIRECTORY(interfaces)
     45ADD_SUBDIRECTORY(items)
     46ADD_SUBDIRECTORY(overlays)
     47ADD_SUBDIRECTORY(pickup)
     48ADD_SUBDIRECTORY(sound)
     49ADD_SUBDIRECTORY(weaponsystem)
     50ADD_SUBDIRECTORY(worldentities)
    3051
    3152ORXONOX_ADD_LIBRARY(orxonox
    3253  FIND_HEADER_FILES
     54  TOLUA_FILES
     55    LevelManager.h
     56    pickup/BaseItem.h
     57    pickup/PickupInventory.h
    3358  DEFINE_SYMBOL
    3459    "ORXONOX_SHARED_BUILD"
     60  PCH_FILE
     61    OrxonoxPrecompiledHeaders.h
    3562  LINK_LIBRARIES
     63    ${Boost_FILESYSTEM_LIBRARY}
     64    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
     65    ${Boost_THREAD_LIBRARY}
     66    ${Boost_DATE_TIME_LIBRARY} # Thread dependency
     67    ${OGRE_LIBRARY}
     68    ${OPENAL_LIBRARY}
     69    ${ALUT_LIBRARY}
     70    ${VORBISFILE_LIBRARY}
     71    ${VORBIS_LIBRARY}
     72    ${OGG_LIBRARY}
     73    tinyxml++_orxonox
    3674    tolua++_orxonox
     75    bullet_orxonox
    3776    util
    3877    core
     78    network
     79    tools
    3980  SOURCE_FILES ${ORXONOX_SRC_FILES}
    4081)

  • code/trunk/src/orxonox/Main.cc

    r5774 r5781  
    4141#include "core/Game.h"
    4242#include "core/LuaState.h"
     43#include "ToluaBindOrxonox.h"
    4344#include "Main.h"
     45
     46SetCommandLineSwitch(console).information("Start in console mode (text IO only)");
     47// Shortcuts for easy direct loading
     48SetCommandLineSwitch(server).information("Start in server mode");
     49SetCommandLineSwitch(client).information("Start in client mode");
     50SetCommandLineSwitch(dedicated).information("Start in dedicated server mode");
     51SetCommandLineSwitch(standalone).information("Start in standalone mode");
     52
     53DeclareToluaInterface(Orxonox);
    4454
    4555namespace orxonox
    … …  
    5565        game->setStateHierarchy(
    5666        "root"
     67        " graphics"
     68        "  mainMenu"
     69        "  standalone"
     70        "   level"
     71        "  server"
     72        "   level"
     73        "  client"
     74        "   level"
     75        " dedicated"
     76        "  level"
     77        " ioConsole"
    5778        );
    5879
    5980        game->requestState("root");
     81
     82        // Some development hacks (not really, but in the future, this calls won't make sense anymore)
     83        if (CommandLine::getValue("standalone").getBool())
     84            Game::getInstance().requestStates("graphics, standalone, level");
     85        else if (CommandLine::getValue("server").getBool())
     86            Game::getInstance().requestStates("graphics, server, level");
     87        else if (CommandLine::getValue("client").getBool())
     88            Game::getInstance().requestStates("graphics, client, level");
     89        else if (CommandLine::getValue("dedicated").getBool())
     90            Game::getInstance().requestStates("dedicated, level");
     91        else if (CommandLine::getValue("console").getBool())
     92            Game::getInstance().requestStates("ioConsole");
     93        else
     94            Game::getInstance().requestStates("graphics, mainMenu");
    6095
    6196        game->run();

  • code/trunk/src/orxonox/OrxonoxPrereqs.h

    r5774 r5781  
    3636
    3737#include "OrxonoxConfig.h"
     38
     39#include "tools/ToolsPrereqs.h"
    3840
    3941//-----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.