Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/buildsystem3/src/ogreceguirenderer/changes_orxonox.diff @ 2682

Last change on this file since 2682 was 2664, checked in by rgrieder, 16 years ago

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

File size: 2.7 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 @@
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"
20--- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009
21+++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009
22@@ -29,9 +29,9 @@
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>
35--- OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:14:09 2009
36+++ OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:07:15 2009
37@@ -25,7 +25,7 @@
38 *************************************************************************/
39 #include "OgreCEGUIResourceProvider.h"
40 
41-#include <CEGUI/CEGUIExceptions.h>
42+#include <CEGUIExceptions.h>
43 #include <OgreArchiveManager.h>
44 
45 
46--- OgreCEGUIResourceProvider.h Wed Jan 28 21:14:09 2009
47+++ OgreCEGUIResourceProvider.h Wed Jan 28 21:06:51 2009
48@@ -26,7 +26,7 @@
49 #ifndef _OgreCEGUIResourceProvider_h_
50 #define _OgreCEGUIResourceProvider_h_
51 
52-#include <CEGUI/CEGUIResourceProvider.h>
53+#include <CEGUIResourceProvider.h>
54 #include "OgreCEGUIRenderer.h"
55 
56 // Start of CEGUI namespace section
57--- OgreCEGUITexture.cpp        Wed Jan 28 21:14:09 2009
58+++ OgreCEGUITexture.cpp        Wed Jan 28 21:07:21 2009
59@@ -24,8 +24,8 @@
60     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
61 *************************************************************************/
62 
63-#include <CEGUI/CEGUISystem.h>
64-#include <CEGUI/CEGUIExceptions.h>
65+#include <CEGUISystem.h>
66+#include <CEGUIExceptions.h>
67 #include "OgreCEGUITexture.h"
68 #include "OgreCEGUIRenderer.h"
69 
70--- OgreCEGUITexture.h  Wed Jan 28 21:14:09 2009
71+++ OgreCEGUITexture.h  Wed Jan 28 21:07:06 2009
72@@ -26,9 +26,9 @@
73 #ifndef _OgreCEGUITexture_h_
74 #define _OgreCEGUITexture_h_
75 
76-#include <CEGUI/CEGUIBase.h>
77-#include <CEGUI/CEGUIRenderer.h>
78-#include <CEGUI/CEGUITexture.h>
79+#include <CEGUIBase.h>
80+#include <CEGUIRenderer.h>
81+#include <CEGUITexture.h>
82 #include "OgreCEGUIRenderer.h"
83 
84 // Start of CEGUI namespace section
Note: See TracBrowser for help on using the repository browser.