Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 9, 2010, 11:45:03 PM (14 years ago)
Author:
rgrieder
Message:

Ogre CEGUI renderer should use its own macros for static builds.

Location:
code/branches/presentation3/src/external/ogreceguirenderer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation3/src/external/ogreceguirenderer/OgreCEGUIRenderer.h

    r5781 r7133  
    3838#include <OgreTextureUnitState.h>
    3939
    40 #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
     40#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_GUIRENDERER_STATIC_LIB)
    4141#   ifdef OGRE_GUIRENDERER_EXPORTS
    4242#       define OGRE_GUIRENDERER_API __declspec(dllexport)
  • code/branches/presentation3/src/external/ogreceguirenderer/changes_orxonox.diff

    r5781 r7133  
    3232--- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009
    3333+++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009
    34 @@ -29,9 +29,9 @@
     34@@ -29,15 +29,15 @@
    3535 #ifndef _OgreCEGUIRenderer_h_
    3636 #define _OgreCEGUIRenderer_h_
     
    4545 #include <OgreRenderQueueListener.h>
    4646 #include <OgreSceneManagerEnumerator.h>
     47 #include <OgreTextureUnitState.h>
     48
     49-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
     50+#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_GUIRENDERER_STATIC_LIB)
     51 #   ifdef OGRE_GUIRENDERER_EXPORTS
     52 #       define OGRE_GUIRENDERER_API __declspec(dllexport)
     53 #   else
    4754--- OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:14:09 2009
    4855+++ OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:07:15 2009
Note: See TracChangeset for help on using the changeset viewer.