- Timestamp:
- Apr 30, 2011, 11:38:14 PM (14 years ago)
- Location:
- code/trunk/src/external/ogreceguirenderer
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/external/ogreceguirenderer/OgreCEGUIRenderer.cpp
r8351 r8367 24 24 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 25 25 *************************************************************************/ 26 27 // Workaround for GCC 4.6 28 #include <cstddef> 26 29 27 30 #include <CEGUIImagesetManager.h> -
code/trunk/src/external/ogreceguirenderer/OgreCEGUIResourceProvider.cpp
r5781 r8367 24 24 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 25 25 *************************************************************************/ 26 27 // Workaround for GCC 4.6 28 #include <cstddef> 29 26 30 #include "OgreCEGUIResourceProvider.h" 27 31 -
code/trunk/src/external/ogreceguirenderer/OgreCEGUITexture.cpp
r5781 r8367 24 24 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 25 25 *************************************************************************/ 26 27 // Workaround for GCC 4.6 28 #include <cstddef> 26 29 27 30 #include <CEGUISystem.h> -
code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff
r8351 r8367 1 --- OgreCEGUIRenderer.cpp Wed Jan 28 21:14:0920092 +++ OgreCEGUIRenderer.cpp Wed Jan 28 21:07:10 20093 @@ -24,1 1 +24,11@@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 @@ 4 4 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 5 5 *************************************************************************/ … … 10 10 -#include <CEGUI/CEGUIExceptions.h> 11 11 -#include <CEGUI/CEGUISystem.h> 12 +// Workaround for GCC 4.6 13 +#include <cstddef> 14 12 15 +#include <CEGUIImagesetManager.h> 13 16 +#include <CEGUIImageset.h> … … 15 18 +#include <CEGUIExceptions.h> 16 19 +#include <CEGUISystem.h> 17 20 + 18 21 #include "OgreCEGUIRenderer.h" 19 22 #include "OgreCEGUITexture.h" 23 #include "OgreCEGUIResourceProvider.h" 20 24 --- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009 21 25 +++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009 … … 40 44 # define OGRE_GUIRENDERER_API __declspec(dllexport) 41 45 # else 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 @@ 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 45 51 *************************************************************************/ 52 + 53 +// Workaround for GCC 4.6 54 +#include <cstddef> 55 + 46 56 #include "OgreCEGUIResourceProvider.h" 47 57 … … 62 72 63 73 // Start of CEGUI namespace section 64 --- OgreCEGUITexture.cpp Wed Jan 28 21:14:09200965 +++ OgreCEGUITexture.cpp Wed Jan 28 21:07:21 200966 @@ -24,8 +24, 8@@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 @@ 67 77 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 68 78 *************************************************************************/ … … 70 80 -#include <CEGUI/CEGUISystem.h> 71 81 -#include <CEGUI/CEGUIExceptions.h> 82 +// Workaround for GCC 4.6 83 +#include <cstddef> 84 + 72 85 +#include <CEGUISystem.h> 73 86 +#include <CEGUIExceptions.h>
Note: See TracChangeset
for help on using the changeset viewer.