Changeset 1697 for code/branches/gui

Timestamp:

Sep 3, 2008, 8:55:49 PM (16 years ago)

Author:

rgrieder

Message:

Minor gcc/CMake 'adjustments'

Location:

code/branches/gui/src

Files:

• core/CMakeLists.txt (modified) (1 diff)
• core/Clock.h (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/gamestates/GSDedicated.cc (modified) (1 diff)
• orxonox/objects/Backlight.cc (modified) (1 diff)
• orxonox/tools/ParticleInterface.cc (modified) (1 diff)
• tolua/toluabind_orxonox.c (modified) (1 diff)
• tolua/toluabind_orxonox.h (modified) (1 diff)

code/branches/gui/src/core/CMakeLists.txt

@@ -1 +1 @@
 SET(CORE_SRC_FILES
+  Clock.cc
   ConfigFileManager.cc
   ConfigValueContainer.cc

code/branches/gui/src/core/Clock.h

@@ -46 +46 @@
     class _CoreExport Clock
     {
-        friend RootGameState;
+        friend class RootGameState;
 
     public:

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

@@ -8 +8 @@
 
   gamestates/GSClient.cc
+  gamestates/GSDedicated.cc
   gamestates/GSGraphics.cc
   gamestates/GSGUI.cc
-  gamestates/GSIO.cc
   gamestates/GSIOConsole.cc
   gamestates/GSLevel.cc

code/branches/gui/src/orxonox/gamestates/GSDedicated.cc

@@ -30 +30 @@
 #include "GSDedicated.h"
 
+#include <OgreRoot.h>
+#include <OgreSceneManager.h>
 #include "core/ConsoleCommand.h"
 #include "core/CommandLine.h"

code/branches/gui/src/orxonox/objects/Backlight.cc

@@ -39 +39 @@
 #include "util/Math.h"
 #include "GraphicsEngine.h"
-#include "Orxonox.h"
 
 namespace orxonox

code/branches/gui/src/orxonox/tools/ParticleInterface.cc

@@ -39 +39 @@
 
 #include "GraphicsEngine.h"
-#include "Orxonox.h"
 #include "core/CoreIncludes.h"
 #include "util/Convert.h"

code/branches/gui/src/tolua/toluabind_orxonox.c

@@ -1 +1 @@
 /*
 ** Lua binding: tolua
-** Generated automatically by tolua++-1.0.92 on Sun Jul 27 14:07:12 2008.
+** Generated automatically by tolua++-1.0.92 on Wed Aug 27 22:42:01 2008.
 */
 

code/branches/gui/src/tolua/toluabind_orxonox.h

@@ -1 +1 @@
 /*
 ** Lua binding: tolua
-** Generated automatically by tolua++-1.0.92 on Sun Jul 27 14:07:12 2008.
+** Generated automatically by tolua++-1.0.92 on Wed Aug 27 22:42:01 2008.
 */