Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/OrxyRoad_FS18/src/external/ogreceguirenderer/changes_orxonox.diff @ 12206

Last change on this file since 12206 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

  • OgreCEGUIRenderer.cpp

     
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
    2626
    27 #include <CEGUI/CEGUIImagesetManager.h>
    28 #include <CEGUI/CEGUIImageset.h>
    29 #include <CEGUI/CEGUIImage.h>
    30 #include <CEGUI/CEGUIExceptions.h>
    31 #include <CEGUI/CEGUISystem.h>
     27// Workaround for GCC 4.6
     28#include <cstddef>
    3229
     30#include <CEGUIImagesetManager.h>
     31#include <CEGUIImageset.h>
     32#include <CEGUIImage.h>
     33#include <CEGUIExceptions.h>
     34#include <CEGUISystem.h>
     35
    3336#include "OgreCEGUIRenderer.h"
    3437#include "OgreCEGUITexture.h"
    3538#include "OgreCEGUIResourceProvider.h"

  • OgreCEGUIRenderer.h

     
    2929#ifndef _OgreCEGUIRenderer_h_
    3030#define _OgreCEGUIRenderer_h_
    3131
    32 #include <CEGUI/CEGUIBase.h>
    33 #include <CEGUI/CEGUIRenderer.h>
    34 #include <CEGUI/CEGUITexture.h>
     32#include <CEGUIBase.h>
     33#include <CEGUIRenderer.h>
     34#include <CEGUITexture.h>
    3535
    3636#include <OgreRenderQueueListener.h>
    3737#include <OgreSceneManagerEnumerator.h>
    3838#include <OgreTextureUnitState.h>
    3939
    40 #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
     40#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_GUIRENDERER_STATIC_LIB)
    4141#   ifdef OGRE_GUIRENDERER_EXPORTS
    4242#       define OGRE_GUIRENDERER_API __declspec(dllexport)
    4343#   else

  • OgreCEGUIResourceProvider.cpp

     
    2323    License along with this library; if not, write to the Free Software
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
     26
     27// Workaround for GCC 4.6
     28#include <cstddef>
     29
    2630#include "OgreCEGUIResourceProvider.h"
    2731
    28 #include <CEGUI/CEGUIExceptions.h>
     32#include <CEGUIExceptions.h>
    2933#include <OgreArchiveManager.h>
    3034
    3135

  • OgreCEGUIResourceProvider.h

     
    2626#ifndef _OgreCEGUIResourceProvider_h_
    2727#define _OgreCEGUIResourceProvider_h_
    2828
    29 #include <CEGUI/CEGUIResourceProvider.h>
     29#include <CEGUIResourceProvider.h>
    3030#include "OgreCEGUIRenderer.h"
    3131
    3232// Start of CEGUI namespace section

  • OgreCEGUITexture.cpp

     
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
    2626
    27 #include <CEGUI/CEGUISystem.h>
    28 #include <CEGUI/CEGUIExceptions.h>
     27// Workaround for GCC 4.6
     28#include <cstddef>
     29
     30#include <CEGUISystem.h>
     31#include <CEGUIExceptions.h>
    2932#include "OgreCEGUITexture.h"
    3033#include "OgreCEGUIRenderer.h"
    3134

  • OgreCEGUITexture.h

     
    2626#ifndef _OgreCEGUITexture_h_
    2727#define _OgreCEGUITexture_h_
    2828
    29 #include <CEGUI/CEGUIBase.h>
    30 #include <CEGUI/CEGUIRenderer.h>
    31 #include <CEGUI/CEGUITexture.h>
     29#include <CEGUIBase.h>
     30#include <CEGUIRenderer.h>
     31#include <CEGUITexture.h>
    3232#include "OgreCEGUIRenderer.h"
    3333
    3434// Start of CEGUI namespace section
Note: See TracBrowser for help on using the repository browser.