Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5842 for code


Ignore:
Timestamp:
Sep 30, 2009, 6:13:09 PM (15 years ago)
Author:
rgrieder
Message:

Moved GameStates back to the orxonox library. This resolves an issue at startup if the command line arguments contained errors. Furthermore you can now simply not build the modules folder and still get a working orxonox.

DELETE ALL "libgamestates*" FILES (esp. in the modules output folder) to avoid problems with duplicate libraries!!!

Location:
code/branches/core5/src
Files:
2 deleted
12 edited
2 copied
1 moved

Legend:

Unmodified
Added
Removed
  • code/branches/core5/src/modules/CMakeLists.txt

    r5752 r5842  
    2727################ Sub Directories ################
    2828
    29 ADD_SUBDIRECTORY(gamestates)
    3029ADD_SUBDIRECTORY(objects)
    3130ADD_SUBDIRECTORY(overlays)
  • code/branches/core5/src/orxonox/CMakeLists.txt

    r5752 r5842  
    3939ADD_SUBDIRECTORY(collisionshapes)
    4040ADD_SUBDIRECTORY(controllers)
     41ADD_SUBDIRECTORY(gamestates)
    4142ADD_SUBDIRECTORY(gametypes)
    4243ADD_SUBDIRECTORY(graphics)
  • code/branches/core5/src/orxonox/gamestates/CMakeLists.txt

    r5749 r5842  
    1 SET_SOURCE_FILES(GAMESTATES_SRC_FILES
     1ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    22  GSClient.cc
    33  GSDedicated.cc
     
    1010  GSStandalone.cc
    1111)
    12 
    13 ORXONOX_ADD_LIBRARY(gamestates
    14   MODULE
    15   FIND_HEADER_FILES
    16   PCH_FILE
    17     GameStatesPrecompiledHeaders.h
    18   DEFINE_SYMBOL
    19     "GAMESTATES_SHARED_BUILD"
    20   LINK_LIBRARIES
    21     orxonox
    22   SOURCE_FILES ${GAMESTATES_SRC_FILES}
    23 )
  • code/branches/core5/src/orxonox/gamestates/GSClient.h

    r5738 r5842  
    3030#define _GSClient_H__
    3131
    32 #include "gamestates/GameStatesPrereqs.h"
     32#include "OrxonoxPrereqs.h"
    3333
    3434#include "core/GameState.h"
     
    3737namespace orxonox
    3838{
    39     class _GameStatesExport GSClient : public GameState
     39    class _OrxonoxExport GSClient : public GameState
    4040    {
    4141    public:
  • code/branches/core5/src/orxonox/gamestates/GSDedicated.h

    r5738 r5842  
    3030#define _GSDedicated_H__
    3131
    32 #include "gamestates/GameStatesPrereqs.h"
     32#include "OrxonoxPrereqs.h"
     33
     34#include <cstring>
     35#include <queue>
     36#include <boost/thread/thread.hpp>
     37#include <boost/thread/mutex.hpp>
     38#include <boost/thread/recursive_mutex.hpp>
    3339
    3440#include "core/GameState.h"
    3541#include "network/NetworkPrereqs.h"
    36 #include <queue>
    37 #include <cstring>
    38 #include <boost/thread/thread.hpp>
    39 #include <boost/thread/mutex.hpp>
    40 #include <boost/thread/recursive_mutex.hpp>
    4142
    4243struct termios;
     
    4546{
    4647
    47     class _GameStatesExport GSDedicated : public GameState
     48    class _OrxonoxExport GSDedicated : public GameState
    4849    {
    4950    public:
  • code/branches/core5/src/orxonox/gamestates/GSGraphics.h

    r5738 r5842  
    3636#define _GSGraphics_H__
    3737
    38 #include "gamestates/GameStatesPrereqs.h"
     38#include "OrxonoxPrereqs.h"
    3939#include "core/GameState.h"
    4040
     
    4747        This game state is only left out if we start a dedicated server where no graphics are present.
    4848    */
    49     class _GameStatesExport GSGraphics : public GameState
     49    class _OrxonoxExport GSGraphics : public GameState
    5050    {
    5151    public:
  • code/branches/core5/src/orxonox/gamestates/GSIOConsole.h

    r5738 r5842  
    3030#define _GSIOConsole_H__
    3131
    32 #include "gamestates/GameStatesPrereqs.h"
     32#include "OrxonoxPrereqs.h"
    3333#include "core/GameState.h"
    3434
    3535namespace orxonox
    3636{
    37     class _GameStatesExport GSIOConsole : public GameState
     37    class _OrxonoxExport GSIOConsole : public GameState
    3838    {
    3939    public:
  • code/branches/core5/src/orxonox/gamestates/GSLevel.h

    r5813 r5842  
    3030#define _GSLevel_H__
    3131
    32 #include "gamestates/GameStatesPrereqs.h"
     32#include "OrxonoxPrereqs.h"
    3333
    3434#include <string>
     
    3939namespace orxonox
    4040{
    41     class _GameStatesExport GSLevel : public GameState, public OrxonoxClass
     41    class _OrxonoxExport GSLevel : public GameState, public OrxonoxClass
    4242    {
    4343    public:
  • code/branches/core5/src/orxonox/gamestates/GSMainMenu.h

    r5819 r5842  
    3030#define _GSMainMenu_H__
    3131
    32 #include "gamestates/GameStatesPrereqs.h"
     32#include "OrxonoxPrereqs.h"
    3333
    3434#include "util/OgreForwardRefs.h"
     
    3737namespace orxonox
    3838{
    39     class _GameStatesExport GSMainMenu : public GameState
     39    class _OrxonoxExport GSMainMenu : public GameState
    4040    {
    4141    public:
  • code/branches/core5/src/orxonox/gamestates/GSRoot.h

    r5738 r5842  
    3030#define _GSRoot_H__
    3131
    32 #include "gamestates/GameStatesPrereqs.h"
     32#include "OrxonoxPrereqs.h"
    3333#include "core/GameState.h"
    3434
    3535namespace orxonox
    3636{
    37     class _GameStatesExport GSRoot : public GameState
     37    class _OrxonoxExport GSRoot : public GameState
    3838    {
    3939    public:
  • code/branches/core5/src/orxonox/gamestates/GSServer.h

    r5738 r5842  
    3030#define _GSServer_H__
    3131
    32 #include "gamestates/GameStatesPrereqs.h"
     32#include "OrxonoxPrereqs.h"
    3333
    3434#include "core/GameState.h"
     
    3737namespace orxonox
    3838{
    39     class _GameStatesExport GSServer : public GameState
     39    class _OrxonoxExport GSServer : public GameState
    4040    {
    4141    public:
  • code/branches/core5/src/orxonox/gamestates/GSStandalone.h

    r5738 r5842  
    3030#define _GSStandalone_H__
    3131
    32 #include "gamestates/GameStatesPrereqs.h"
     32#include "OrxonoxPrereqs.h"
    3333#include "core/GameState.h"
    3434
    3535namespace orxonox
    3636{
    37     class _GameStatesExport GSStandalone : public GameState
     37    class _OrxonoxExport GSStandalone : public GameState
    3838    {
    3939    public:
Note: See TracChangeset for help on using the changeset viewer.