Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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/orxonox/gamestates
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • 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:
Note: See TracChangeset for help on using the changeset viewer.