Changeset 1846 for code/branches/orxonox_tutorial/src/orxonox

Timestamp:

Sep 28, 2008, 2:27:03 PM (16 years ago)

Author:

rgrieder

Message:

Merged Revisions 1831 - 1845 to tutorial. This is an update from the trunk.

Location:

code/branches/orxonox_tutorial

Files:

• . (modified) (1 prop)
• src/orxonox/CMakeLists.txt (modified) (3 diffs)
• src/orxonox/OrxonoxStableHeaders.h (modified) (2 diffs)
• src/orxonox/SignalHandler.cc (modified) (1 diff)
• src/orxonox/gui/OgreCEGUIRenderer.h (modified) (1 diff)
• src/orxonox/objects/WorldEntity.h (modified) (1 diff)

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

@@ -34 +34 @@
   overlays/hud/HUDSpeedBar.cc
 
-  tolua/tolua_bind.cc
-
   tools/BillboardSet.cc
   tools/Light.cc
@@ -64 +62 @@
   objects/RotatingProjectile.cc
   objects/ParticleProjectile.cc
+
+  tolua/tolua_bind.cc
 )
 
 GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
+  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h
   COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
   DEPENDS
@@ -105 +105 @@
   tinyxml_orxonox
   tolualib_orxonox
-  ois_orxonox
   util
   core

code/branches/orxonox_tutorial/src/orxonox/OrxonoxStableHeaders.h

@@ -79 +79 @@
 #include "util/String.h"
 #include "util/SubString.h"
-#include "util/XMLIncludes.h"
 
 #include "core/BaseObject.h"
@@ -87 +86 @@
 #include "core/CommandExecutor.h"
 #include "core/Executor.h"
+#include "core/XMLIncludes.h"
 #include "core/XMLPort.h"
 

code/branches/orxonox_tutorial/src/orxonox/SignalHandler.cc

@@ -38 +38 @@
 #include <assert.h>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 SignalHandler * SignalHandler::singletonRef = NULL;

code/branches/orxonox_tutorial/src/orxonox/gui/OgreCEGUIRenderer.h

@@ -38 +38 @@
 #include <OgreTextureUnitState.h>
 
-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
-#   ifdef OGRE_GUIRENDERER_EXPORTS
+/** CHANGES MADE BY ORXONOX TO FIT DLL IMPORT/EXPORT **/
+#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !(defined(ORXONOX_STATIC_BUILD) || defined(ORXONOX_NO_EXPORTS))
+#   ifdef ORXONOX_SHARED_BUILD
 #       define OGRE_GUIRENDERER_API __declspec(dllexport)
 #   else

code/branches/orxonox_tutorial/src/orxonox/objects/WorldEntity.h

@@ -35 +35 @@
 #include <OgreSceneNode.h>
 #include "util/Math.h"
-#include "util/XMLIncludes.h"
 #include "network/Synchronisable.h"
+#include "core/XMLIncludes.h"
 #include "core/BaseObject.h"
 #include "Tickable.h"
-#include "../tools/Mesh.h"
+#include "tools/Mesh.h"
 
 namespace orxonox