Changeset 5842

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:

• modules/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/gamestates (moved) (moved from code/branches/core5/src/modules/gamestates)
• orxonox/gamestates/CMakeLists.txt (modified) (2 diffs)
• orxonox/gamestates/GSClient.h (modified) (2 diffs)
• orxonox/gamestates/GSDedicated.h (modified) (2 diffs)
• orxonox/gamestates/GSGraphics.cc (copied) (copied from code/branches/core5/src/modules/gamestates/GSGraphics.cc)
• orxonox/gamestates/GSGraphics.h (modified) (2 diffs)
• orxonox/gamestates/GSIOConsole.h (modified) (1 diff)
• orxonox/gamestates/GSLevel.cc (copied) (copied from code/branches/core5/src/modules/gamestates/GSLevel.cc)
• orxonox/gamestates/GSLevel.h (modified) (2 diffs)
• orxonox/gamestates/GSMainMenu.h (modified) (2 diffs)
• orxonox/gamestates/GSRoot.h (modified) (1 diff)
• orxonox/gamestates/GSServer.h (modified) (2 diffs)
• orxonox/gamestates/GSStandalone.h (modified) (1 diff)
• orxonox/gamestates/GameStatesPrecompiledHeaders.h (deleted)
• orxonox/gamestates/GameStatesPrereqs.h (deleted)

code/branches/core5/src/modules/CMakeLists.txt

@@ -27 +27 @@
 ################ Sub Directories ################
 
-ADD_SUBDIRECTORY(gamestates)
 ADD_SUBDIRECTORY(objects)
 ADD_SUBDIRECTORY(overlays)

code/branches/core5/src/orxonox/CMakeLists.txt

@@ -39 +39 @@
 ADD_SUBDIRECTORY(collisionshapes)
 ADD_SUBDIRECTORY(controllers)
+ADD_SUBDIRECTORY(gamestates)
 ADD_SUBDIRECTORY(gametypes)
 ADD_SUBDIRECTORY(graphics)

code/branches/core5/src/orxonox/gamestates/CMakeLists.txt

@@ -1 @@
-SET_SOURCE_FILES(GAMESTATES_SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   GSClient.cc
   GSDedicated.cc
@@ -10 +10 @@
   GSStandalone.cc
 )
-
-ORXONOX_ADD_LIBRARY(gamestates
-  MODULE
-  FIND_HEADER_FILES
-  PCH_FILE
-    GameStatesPrecompiledHeaders.h
-  DEFINE_SYMBOL
-    "GAMESTATES_SHARED_BUILD"
-  LINK_LIBRARIES
-    orxonox
-  SOURCE_FILES ${GAMESTATES_SRC_FILES}
-)

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

@@ -30 +30 @@
 #define _GSClient_H__
 
-#include "gamestates/GameStatesPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "core/GameState.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _GameStatesExport GSClient : public GameState
+    class _OrxonoxExport GSClient : public GameState
     {
     public:

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:

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

@@ -36 +36 @@
 #define _GSGraphics_H__
 
-#include "gamestates/GameStatesPrereqs.h"
+#include "OrxonoxPrereqs.h"
 #include "core/GameState.h"
 
@@ -47 +47 @@
         This game state is only left out if we start a dedicated server where no graphics are present.
     */
-    class _GameStatesExport GSGraphics : public GameState
+    class _OrxonoxExport GSGraphics : public GameState
     {
     public:

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

@@ -30 +30 @@
 #define _GSIOConsole_H__
 
-#include "gamestates/GameStatesPrereqs.h"
+#include "OrxonoxPrereqs.h"
 #include "core/GameState.h"
 
 namespace orxonox
 {
-    class _GameStatesExport GSIOConsole : public GameState
+    class _OrxonoxExport GSIOConsole : public GameState
     {
     public:

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

@@ -30 +30 @@
 #define _GSLevel_H__
 
-#include "gamestates/GameStatesPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include <string>
@@ -39 +39 @@
 namespace orxonox
 {
-    class _GameStatesExport GSLevel : public GameState, public OrxonoxClass
+    class _OrxonoxExport GSLevel : public GameState, public OrxonoxClass
     {
     public:

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

@@ -30 +30 @@
 #define _GSMainMenu_H__
 
-#include "gamestates/GameStatesPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "util/OgreForwardRefs.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _GameStatesExport GSMainMenu : public GameState
+    class _OrxonoxExport GSMainMenu : public GameState
     {
     public:

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

@@ -30 +30 @@
 #define _GSRoot_H__
 
-#include "gamestates/GameStatesPrereqs.h"
+#include "OrxonoxPrereqs.h"
 #include "core/GameState.h"
 
 namespace orxonox
 {
-    class _GameStatesExport GSRoot : public GameState
+    class _OrxonoxExport GSRoot : public GameState
     {
     public:

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

@@ -30 +30 @@
 #define _GSServer_H__
 
-#include "gamestates/GameStatesPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "core/GameState.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _GameStatesExport GSServer : public GameState
+    class _OrxonoxExport GSServer : public GameState
     {
     public:

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

@@ -30 +30 @@
 #define _GSStandalone_H__
 
-#include "gamestates/GameStatesPrereqs.h"
+#include "OrxonoxPrereqs.h"
 #include "core/GameState.h"
 
 namespace orxonox
 {
-    class _GameStatesExport GSStandalone : public GameState
+    class _OrxonoxExport GSStandalone : public GameState
     {
     public: