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

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/gui/OgreCEGUIRenderer.h (modified) (1 diff)

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