Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff @ 11251

Last change on this file since 11251 was 8367, checked in by rgrieder, 14 years ago

by Adi: Fix for GCC 4.6. The actual problem is in CEGUIString.h, but we cannot really fix that ;)
  • Property svn:eol-style set to native
File size: 3.3 KB
RevLine 
[8367]1--- OgreCEGUIRenderer.cpp       Sun Dec 27 10:40:24 2009
2+++ OgreCEGUIRenderer.cpp       Sat Apr 30 17:21:29 2011
3@@ -24,12 +24,15 @@
[2705]4     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
5 *************************************************************************/
6 
7-#include <CEGUI/CEGUIImagesetManager.h>
8-#include <CEGUI/CEGUIImageset.h>
9-#include <CEGUI/CEGUIImage.h>
10-#include <CEGUI/CEGUIExceptions.h>
11-#include <CEGUI/CEGUISystem.h>
[8367]12+// Workaround for GCC 4.6
13+#include <cstddef>
14 
[2705]15+#include <CEGUIImagesetManager.h>
16+#include <CEGUIImageset.h>
17+#include <CEGUIImage.h>
18+#include <CEGUIExceptions.h>
19+#include <CEGUISystem.h>
[8367]20+
[2705]21 #include "OgreCEGUIRenderer.h"
22 #include "OgreCEGUITexture.h"
[8367]23 #include "OgreCEGUIResourceProvider.h"
[2602]24--- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009
25+++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009
[7163]26@@ -29,15 +29,15 @@
[2705]27 #ifndef _OgreCEGUIRenderer_h_
28 #define _OgreCEGUIRenderer_h_
29 
30-#include <CEGUI/CEGUIBase.h>
31-#include <CEGUI/CEGUIRenderer.h>
32-#include <CEGUI/CEGUITexture.h>
33+#include <CEGUIBase.h>
34+#include <CEGUIRenderer.h>
35+#include <CEGUITexture.h>
36 
37 #include <OgreRenderQueueListener.h>
38 #include <OgreSceneManagerEnumerator.h>
[7163]39 #include <OgreTextureUnitState.h>
40
41-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
42+#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_GUIRENDERER_STATIC_LIB)
43 #   ifdef OGRE_GUIRENDERER_EXPORTS
44 #       define OGRE_GUIRENDERER_API __declspec(dllexport)
45 #   else
[8367]46--- OgreCEGUIResourceProvider.cpp       Sun Dec 27 10:40:24 2009
47+++ OgreCEGUIResourceProvider.cpp       Sat Apr 30 17:21:40 2011
48@@ -23,9 +23,13 @@
49     License along with this library; if not, write to the Free Software
50     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
[2705]51 *************************************************************************/
[8367]52+
53+// Workaround for GCC 4.6
54+#include <cstddef>
55+
[2705]56 #include "OgreCEGUIResourceProvider.h"
57 
58-#include <CEGUI/CEGUIExceptions.h>
59+#include <CEGUIExceptions.h>
60 #include <OgreArchiveManager.h>
61 
62 
[2602]63--- OgreCEGUIResourceProvider.h Wed Jan 28 21:14:09 2009
64+++ OgreCEGUIResourceProvider.h Wed Jan 28 21:06:51 2009
65@@ -26,7 +26,7 @@
[2705]66 #ifndef _OgreCEGUIResourceProvider_h_
67 #define _OgreCEGUIResourceProvider_h_
68 
69-#include <CEGUI/CEGUIResourceProvider.h>
70+#include <CEGUIResourceProvider.h>
71 #include "OgreCEGUIRenderer.h"
72 
73 // Start of CEGUI namespace section
[8367]74--- OgreCEGUITexture.cpp        Sun Dec 27 10:40:24 2009
75+++ OgreCEGUITexture.cpp        Sat Apr 30 17:21:52 2011
76@@ -24,8 +24,11 @@
[2705]77     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
78 *************************************************************************/
79 
80-#include <CEGUI/CEGUISystem.h>
81-#include <CEGUI/CEGUIExceptions.h>
[8367]82+// Workaround for GCC 4.6
83+#include <cstddef>
84+
[2705]85+#include <CEGUISystem.h>
86+#include <CEGUIExceptions.h>
87 #include "OgreCEGUITexture.h"
88 #include "OgreCEGUIRenderer.h"
89 
[2602]90--- OgreCEGUITexture.h  Wed Jan 28 21:14:09 2009
91+++ OgreCEGUITexture.h  Wed Jan 28 21:07:06 2009
92@@ -26,9 +26,9 @@
[2705]93 #ifndef _OgreCEGUITexture_h_
94 #define _OgreCEGUITexture_h_
95 
96-#include <CEGUI/CEGUIBase.h>
97-#include <CEGUI/CEGUIRenderer.h>
98-#include <CEGUI/CEGUITexture.h>
99+#include <CEGUIBase.h>
100+#include <CEGUIRenderer.h>
101+#include <CEGUITexture.h>
102 #include "OgreCEGUIRenderer.h"
103 
104 // Start of CEGUI namespace section
Note: See TracBrowser for help on using the repository browser.