[Orxonox-commit 2424] r7133 - code/branches/presentation3/src/external/ogreceguirenderer

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-06-09 23:45:03 +0200 (Wed, 09 Jun 2010)
New Revision: 7133

Modified:
   code/branches/presentation3/src/external/ogreceguirenderer/OgreCEGUIRenderer.h
   code/branches/presentation3/src/external/ogreceguirenderer/changes_orxonox.diff
Log:
Ogre CEGUI renderer should use its own macros for static builds.

Modified: code/branches/presentation3/src/external/ogreceguirenderer/OgreCEGUIRenderer.h
===================================================================
--- code/branches/presentation3/src/external/ogreceguirenderer/OgreCEGUIRenderer.h	2010-06-09 21:19:14 UTC (rev 7132)
+++ code/branches/presentation3/src/external/ogreceguirenderer/OgreCEGUIRenderer.h	2010-06-09 21:45:03 UTC (rev 7133)
@@ -37,7 +37,7 @@
 #include <OgreSceneManagerEnumerator.h>
 #include <OgreTextureUnitState.h>
 
-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
+#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_GUIRENDERER_STATIC_LIB)
 #   ifdef OGRE_GUIRENDERER_EXPORTS
 #       define OGRE_GUIRENDERER_API __declspec(dllexport)
 #   else

Modified: code/branches/presentation3/src/external/ogreceguirenderer/changes_orxonox.diff
===================================================================
--- code/branches/presentation3/src/external/ogreceguirenderer/changes_orxonox.diff	2010-06-09 21:19:14 UTC (rev 7132)
+++ code/branches/presentation3/src/external/ogreceguirenderer/changes_orxonox.diff	2010-06-09 21:45:03 UTC (rev 7133)
@@ -31,7 +31,7 @@
  	d_render_sys->_disableTextureUnitsFrom(1);
 --- OgreCEGUIRenderer.h	Wed Jan 28 21:14:09 2009
 +++ OgreCEGUIRenderer.h	Wed Jan 28 21:06:46 2009
-@@ -29,9 +29,9 @@
+@@ -29,15 +29,15 @@
  #ifndef _OgreCEGUIRenderer_h_
  #define _OgreCEGUIRenderer_h_
  
@@ -44,6 +44,13 @@
  
  #include <OgreRenderQueueListener.h>
  #include <OgreSceneManagerEnumerator.h>
+ #include <OgreTextureUnitState.h>
+
+-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
++#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_GUIRENDERER_STATIC_LIB)
+ #   ifdef OGRE_GUIRENDERER_EXPORTS
+ #       define OGRE_GUIRENDERER_API __declspec(dllexport)
+ #   else
 --- OgreCEGUIResourceProvider.cpp	Wed Jan 28 21:14:09 2009
 +++ OgreCEGUIResourceProvider.cpp	Wed Jan 28 21:07:15 2009
 @@ -25,7 +25,7 @@