Changeset 2569 for code/branches/buildsystem2/src

Timestamp:

Jan 6, 2009, 10:38:41 AM (15 years ago)

Author:

rgrieder

Message:

Moved OgreCEGUIRenderer to its own folder in src since it's actually a library.

Location:

code/branches/buildsystem2/src

Files:

• CMakeLists.txt (modified) (2 diffs)
• ogreceguirenderer (added)
• ogreceguirenderer/AUTHORS (added)
• ogreceguirenderer/CMakeLists.txt (added)
• ogreceguirenderer/COPYING (added)
• ogreceguirenderer/OgreCEGUIRenderer.cpp (moved) (moved from code/branches/buildsystem2/src/orxonox/gui/OgreCEGUIRenderer.cpp) (1 diff)
• ogreceguirenderer/OgreCEGUIRenderer.h (moved) (moved from code/branches/buildsystem2/src/orxonox/gui/OgreCEGUIRenderer.h) (3 diffs)
• ogreceguirenderer/OgreCEGUIResourceProvider.cpp (moved) (moved from code/branches/buildsystem2/src/orxonox/gui/OgreCEGUIResourceProvider.cpp) (1 diff)
• ogreceguirenderer/OgreCEGUIResourceProvider.h (moved) (moved from code/branches/buildsystem2/src/orxonox/gui/OgreCEGUIResourceProvider.h) (2 diffs)
• ogreceguirenderer/OgreCEGUITexture.cpp (moved) (moved from code/branches/buildsystem2/src/orxonox/gui/OgreCEGUITexture.cpp) (1 diff)
• ogreceguirenderer/OgreCEGUITexture.h (moved) (moved from code/branches/buildsystem2/src/orxonox/gui/OgreCEGUITexture.h) (2 diffs)
• ogreceguirenderer/VERSION (added)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/gui/CMakeLists.txt (modified) (1 diff)
• orxonox/gui/GUIManager.cc (modified) (2 diffs)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -18 +18 @@
 INCLUDE_DIRECTORIES(
   cpptcl
+  ogreceguirenderer
   ois
   tinyxml
@@ -35 +36 @@
 
 ADD_SUBDIRECTORY(cpptcl)
+ADD_SUBDIRECTORY(ogreceguirenderer)
 ADD_SUBDIRECTORY(ois)
 ADD_SUBDIRECTORY(tinyxml)

code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUIRenderer.cpp

@@ -25 +25 @@
 *************************************************************************/
 
-#include "OrxonoxStableHeaders.h"
 #include <CEGUIImagesetManager.h>
 #include <CEGUIImageset.h>

code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUIRenderer.h

@@ -27 +27 @@
     This file contains code that is specific to Ogre (http://www.ogre3d.org)
 *************************************************************************/
-#ifndef _OgreCEGUIRenderer_H__
-#define _OgreCEGUIRenderer_H__
+#ifndef _OgreCEGUIRenderer_h_
+#define _OgreCEGUIRenderer_h_
 
 #include <CEGUIBase.h>
@@ -38 +38 @@
 #include <OgreTextureUnitState.h>
 
-/** 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
+#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
+#   ifdef OGRE_GUIRENDERER_EXPORTS
 #       define OGRE_GUIRENDERER_API __declspec(dllexport)
 #   else
@@ -463 +462 @@
 
 
-#endif  // end of guard _OgreCEGUIRenderer_H__
+#endif  // end of guard _OgreCEGUIRenderer_h_

code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUIResourceProvider.cpp

@@ -24 +24 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *************************************************************************/
-#include "OrxonoxStableHeaders.h"
 #include "OgreCEGUIResourceProvider.h"
 

code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUIResourceProvider.h

@@ -24 +24 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *************************************************************************/
-#ifndef _OgreCEGUIResourceProvider_H__
-#define _OgreCEGUIResourceProvider_H__
+#ifndef _OgreCEGUIResourceProvider_h_
+#define _OgreCEGUIResourceProvider_h_
 
 #include <CEGUIResourceProvider.h>
@@ -50 +50 @@
 } // End of  CEGUI namespace section
 
-#endif  // end of guard _OgreCEGUIResourceProvider_H__
+#endif  // end of guard _OgreCEGUIResourceProvider_h_

code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUITexture.cpp

@@ -25 +25 @@
 *************************************************************************/
 
-#include "OrxonoxStableHeaders.h"
 #include <CEGUISystem.h>
 #include <CEGUIExceptions.h>

code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUITexture.h

@@ -24 +24 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *************************************************************************/
-#ifndef _OgreCEGUITexture_H__
-#define _OgreCEGUITexture_H__
+#ifndef _OgreCEGUITexture_h_
+#define _OgreCEGUITexture_h_
 
 #include <CEGUIBase.h>
@@ -177 +177 @@
 
 
-#endif  // end of guard _OgreCEGUITexture_H__
+#endif  // end of guard _OgreCEGUITexture_h_

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

@@ -40 +40 @@
   #${CEGUI_SCRIPT_LIBRARIES}
   ceguilua_orxonox
+  ogreceguirenderer_orxonox
   tinyxml_orxonox
   tolualib_orxonox

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(
   GUIManager.cc
-  OgreCEGUIRenderer.cpp
-  OgreCEGUIResourceProvider.cpp
-  OgreCEGUITexture.cpp
 )

code/branches/buildsystem2/src/orxonox/gui/GUIManager.cc

@@ -40 +40 @@
 #include <CEGUI.h>
 #include <CEGUILua.h>
+#include <OgreCEGUIRenderer.h>
+
 #include "util/Exception.h"
 #include "core/input/InputManager.h"
@@ -47 +49 @@
 #include "core/ToluaBindCore.h"
 #include "ToluaBindOrxonox.h"
-#include "OgreCEGUIRenderer.h"
 
 extern "C" {