Changeset 5842 for code/branches/core5/src/orxonox/gamestates/GSDedicated.h

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:

• . (moved) (moved from code/branches/core5/src/modules/gamestates)
• GSDedicated.h (modified) (2 diffs)

code/branches/core5/src/orxonox/gamestates/GSDedicated.h

@@ -30 +30 @@
 #define _GSDedicated_H__
 
-#include "gamestates/GameStatesPrereqs.h"
+#include "OrxonoxPrereqs.h"
+
+#include <cstring>
+#include <queue>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/recursive_mutex.hpp>
 
 #include "core/GameState.h"
 #include "network/NetworkPrereqs.h"
-#include <queue>
-#include <cstring>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/recursive_mutex.hpp>
 
 struct termios;
@@ -45 +46 @@
 {
 
-    class _GameStatesExport GSDedicated : public GameState
+    class _OrxonoxExport GSDedicated : public GameState
     {
     public: