Changeset 2569 for code/branches/buildsystem2/src/ogreceguirenderer

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/branches/buildsystem2/src/ogreceguirenderer

Files:

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

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_