Changeset 7163 for code/trunk/src/external/ogreceguirenderer

Timestamp:

Aug 11, 2010, 8:55:13 AM (14 years ago)

Author:

dafrick

Message:

Merged presentation3 branch into trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/external/ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• src/external/ogreceguirenderer/OgreCEGUIRenderer.h (modified) (1 diff)
• src/external/ogreceguirenderer/changes_orxonox.diff (modified) (2 diffs)

code/trunk/src/external/ogreceguirenderer/CMakeLists.txt

@@ -32 +32 @@
 ORXONOX_ADD_LIBRARY(ogreceguirenderer_orxonox
   ORXONOX_EXTERNAL
-  LINK_LIBRARIES
-    ${OGRE_LIBRARY}
-    ${CEGUI_LIBRARY}
   DEFINE_SYMBOL
     "OGRE_GUIRENDERER_EXPORTS"
   VERSION
     1.4.9
+  LINK_LIBRARIES
+    ${OGRE_LIBRARY}
+    ${CEGUI_LIBRARY}
   SOURCE_FILES
     ${OCR_FILES}

code/trunk/src/external/ogreceguirenderer/OgreCEGUIRenderer.h

@@ -38 +38 @@
 #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)

code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff

@@ -32 +32 @@
 --- 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_
@@ -45 +45 @@
  #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