Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/kicklib2/src/external/ogreceguirenderer/changes_orxonox.diff @ 8655

Last change on this file since 8655 was 8283, checked in by rgrieder, 14 years ago

Merged revisions 7940-7974 from kicklib to kicklib2.
  • Property svn:eol-style set to native
File size: 2.9 KB
RevLine 
[2602]1--- OgreCEGUIRenderer.cpp       Wed Jan 28 21:14:09 2009
2+++ OgreCEGUIRenderer.cpp       Wed Jan 28 21:07:10 2009
3@@ -24,11 +24,11 @@
[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>
12+#include <CEGUIImagesetManager.h>
13+#include <CEGUIImageset.h>
14+#include <CEGUIImage.h>
15+#include <CEGUIExceptions.h>
16+#include <CEGUISystem.h>
17 
18 #include "OgreCEGUIRenderer.h"
19 #include "OgreCEGUITexture.h"
[2602]20--- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009
21+++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009
[7163]22@@ -29,15 +29,15 @@
[2705]23 #ifndef _OgreCEGUIRenderer_h_
24 #define _OgreCEGUIRenderer_h_
25 
26-#include <CEGUI/CEGUIBase.h>
27-#include <CEGUI/CEGUIRenderer.h>
28-#include <CEGUI/CEGUITexture.h>
29+#include <CEGUIBase.h>
30+#include <CEGUIRenderer.h>
31+#include <CEGUITexture.h>
32 
33 #include <OgreRenderQueueListener.h>
34 #include <OgreSceneManagerEnumerator.h>
[7163]35 #include <OgreTextureUnitState.h>
36
37-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
38+#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_GUIRENDERER_STATIC_LIB)
39 #   ifdef OGRE_GUIRENDERER_EXPORTS
40 #       define OGRE_GUIRENDERER_API __declspec(dllexport)
41 #   else
[2602]42--- OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:14:09 2009
43+++ OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:07:15 2009
44@@ -25,7 +25,7 @@
[2705]45 *************************************************************************/
46 #include "OgreCEGUIResourceProvider.h"
47 
48-#include <CEGUI/CEGUIExceptions.h>
49+#include <CEGUIExceptions.h>
50 #include <OgreArchiveManager.h>
51 
52 
[2602]53--- OgreCEGUIResourceProvider.h Wed Jan 28 21:14:09 2009
54+++ OgreCEGUIResourceProvider.h Wed Jan 28 21:06:51 2009
55@@ -26,7 +26,7 @@
[2705]56 #ifndef _OgreCEGUIResourceProvider_h_
57 #define _OgreCEGUIResourceProvider_h_
58 
59-#include <CEGUI/CEGUIResourceProvider.h>
60+#include <CEGUIResourceProvider.h>
61 #include "OgreCEGUIRenderer.h"
62 
63 // Start of CEGUI namespace section
[2602]64--- OgreCEGUITexture.cpp        Wed Jan 28 21:14:09 2009
65+++ OgreCEGUITexture.cpp        Wed Jan 28 21:07:21 2009
66@@ -24,8 +24,8 @@
[2705]67     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
68 *************************************************************************/
69 
70-#include <CEGUI/CEGUISystem.h>
71-#include <CEGUI/CEGUIExceptions.h>
72+#include <CEGUISystem.h>
73+#include <CEGUIExceptions.h>
74 #include "OgreCEGUITexture.h"
75 #include "OgreCEGUIRenderer.h"
76 
[2602]77--- OgreCEGUITexture.h  Wed Jan 28 21:14:09 2009
78+++ OgreCEGUITexture.h  Wed Jan 28 21:07:06 2009
79@@ -26,9 +26,9 @@
[2705]80 #ifndef _OgreCEGUITexture_h_
81 #define _OgreCEGUITexture_h_
82 
83-#include <CEGUI/CEGUIBase.h>
84-#include <CEGUI/CEGUIRenderer.h>
85-#include <CEGUI/CEGUITexture.h>
86+#include <CEGUIBase.h>
87+#include <CEGUIRenderer.h>
88+#include <CEGUITexture.h>
89 #include "OgreCEGUIRenderer.h"
90 
91 // Start of CEGUI namespace section
Note: See TracBrowser for help on using the repository browser.