CEGUI-irrlicht.patch

   1 --- CEGUI-0.5.0/acinclude.m4.orig       2007-12-26 13:53:05.799672000 +0100
   2 +++ CEGUI-0.5.0/acinclude.m4    2007-12-26 14:06:00.363738552 +0100
   3 @@ -214,6 +214,7 @@
   4      cegui_saved_CFLAGS="$CPPFLAGS"
   5      cegui_saved_LIBS="$LIBS"
   6
   7 +    AC_LANG_PUSH([C++])
   8      for cegui_path in $cegui_inc_paths; do
   9          ifelse($cegui_path, [.], CPPFLAGS="$cegui_saved_CFLAGS", CPPFLAGS="-I$cegui_path $cegui_saved_CFLAGS")
  10          AC_PREPROC_IFELSE([#include <irrlicht.h>], [cegui_irr_h_found=yes; cegui_irr_flags="$cegui_path"; break],[cegui_irr_h_found=no])
  11 @@ -241,6 +242,7 @@
  12      else
  13          ifelse([$3], [], :, [$3])
  14      fi
  15 +    AC_LANG_POP([C++])
  16  ])
  17
  18  AC_DEFUN([CEGUI_ENABLE_OPENGL_RENDERER], [
  19 --- CEGUI-0.5.0/RendererModules/IrrlichtRenderer/IrrlichtMemoryFile.h.orig      2006-06-08 18:25:39.000000000 +0200
  20 +++ CEGUI-0.5.0/RendererModules/IrrlichtRenderer/IrrlichtMemoryFile.h   2007-12-26 17:51:27.802141527 +0100
  21 @@ -43,11 +43,11 @@
  22  public:
  23      IrrlichtMemoryFile(const String& filename, const unsigned char* memory, uint32 size);
  24      virtual ~IrrlichtMemoryFile() {};
  25 -    virtual irr::s32 read(void* buffer, irr::s32 sizeToRead);
  26 -    virtual bool seek(irr::s32 finalPos, bool relativeMovement = false);
  27 -    virtual irr::s32 getSize();
  28 -    virtual irr::s32 getPos();
  29 -    virtual const irr::c8* getFileName();
  30 +    virtual irr::s32 read(void* buffer, irr::u32 sizeToRead);
  31 +    virtual bool seek(long finalPos, bool relativeMovement = false);
  32 +    virtual long getSize() const;
  33 +    virtual long getPos() const;
  34 +    virtual const irr::c8* getFileName() const;
  35
  36  protected:
  37      String d_filename;
  38 --- CEGUI-0.5.0/RendererModules/IrrlichtRenderer/IrrlichtMemoryFile.cpp.orig    2006-06-08 18:25:39.000000000 +0200
  39 +++ CEGUI-0.5.0/RendererModules/IrrlichtRenderer/IrrlichtMemoryFile.cpp 2007-12-26 14:20:45.676239376 +0100
  40 @@ -39,7 +39,7 @@ IrrlichtMemoryFile::IrrlichtMemoryFile(c
  41  {
  42  }
  43
  44 -irr::s32 IrrlichtMemoryFile::read(void* buffer, irr::s32 sizeToRead)
  45 +irr::s32 IrrlichtMemoryFile::read(void* buffer, irr::u32 sizeToRead)
  46  {
  47      uint32 realReadSize =
  48          ((d_position + sizeToRead) > d_size) ? d_size - d_position : sizeToRead;
  49 @@ -50,7 +50,7 @@ irr::s32 IrrlichtMemoryFile::read(void*
  50      return realReadSize;
  51  }
  52
  53 -bool IrrlichtMemoryFile::seek(irr::s32 finalPos, bool relativeMovement)
  54 +bool IrrlichtMemoryFile::seek(long finalPos, bool relativeMovement)
  55  {
  56      uint32 targetPosition = relativeMovement ? d_position : 0;
  57      targetPosition += finalPos;
  58 @@ -66,17 +66,17 @@ bool IrrlichtMemoryFile::seek(long f
  59      }
  60  }
  61
  62 -irr::s32 IrrlichtMemoryFile::getSize()
  63 +long IrrlichtMemoryFile::getSize() const
  64  {
  65      return d_size;
  66  }
  67
  68 -irr::s32 IrrlichtMemoryFile::getPos()
  69 +long IrrlichtMemoryFile::getPos() const
  70  {
  71      return d_position;
  72  }
  73
  74 -const irr::c8* IrrlichtMemoryFile::getFileName()
  75 +const irr::c8* IrrlichtMemoryFile::getFileName() const
  76  {
  77      return d_filename.c_str();
  78  }
  79 --- CEGUI-0.5.0/RendererModules/IrrlichtRenderer/irrlichtrenderer.h.orig        2006-06-08 18:25:39.000000000 +0200
  80 +++ CEGUI-0.5.0/RendererModules/IrrlichtRenderer/irrlichtrenderer.h     2007-12-26 18:00:20.725801530 +0100
  81 @@ -81,7 +81,7 @@ namespace CEGUI
  82                 virtual ResourceProvider* createResourceProvider(void);
  83
  84                 /*! forward event to CEGUI system */
  85 -               bool OnEvent(irr::SEvent& event);
  86 +               bool OnEvent(const irr::SEvent& event);
  87
  88
  89                 /*************************************************************************
  90 --- CEGUI-0.5.0/RendererModules/IrrlichtRenderer/irrlichtrenderer.cpp.orig      2006-08-06 12:49:02.000000000 +0200
  91 +++ CEGUI-0.5.0/RendererModules/IrrlichtRenderer/irrlichtrenderer.cpp   2007-12-26 18:00:36.286589724 +0100
  92 @@ -265,7 +265,7 @@ namespace CEGUI
  93         }
  94
  95         /*! forward event to CEGUI system */
  96 -       bool IrrlichtRenderer::OnEvent(irr::SEvent& event)
  97 +       bool IrrlichtRenderer::OnEvent(const irr::SEvent& event)
  98         {
  99                 return eventpusher->OnEvent(event);
 100         }
 101 --- CEGUI-0.5.0/RendererModules/IrrlichtRenderer/IrrlichtEventPusher.h.orig     2006-08-02 20:55:09.000000000 +0200
 102 +++ CEGUI-0.5.0/RendererModules/IrrlichtRenderer/IrrlichtEventPusher.h  2007-12-26 18:01:42.862671474 +0100
 103 @@ -56,7 +56,7 @@ namespace CEGUI
 104
 105                 virtual ~EventPusher(){};
 106
 107 -               bool OnEvent(SEvent& event)
 108 +               bool OnEvent(const SEvent& event)
 109                 {
 110                         switch(event.EventType)
 111                         {
 112 --- CEGUI-0.5.0/Samples/common/src/CEGuiIrrlichtBaseApplication.cpp.orig        2006-08-09 21:39:16.000000000 +0200
 113 +++ CEGUI-0.5.0/Samples/common/src/CEGuiIrrlichtBaseApplication.cpp     2007-12-26 17:59:02.811854993 +0100
 114 @@ -140,7 +140,7 @@ void CEGuiIrrlichtBaseApplication::clean
 115      // Nothing to do here.
 116  }
 117
 118 -bool CEGuiIrrlichtBaseApplication::OnEvent(irr::SEvent event)
 119 +bool CEGuiIrrlichtBaseApplication::OnEvent(const irr::SEvent &event)
 120  {
 121      // cegui samples always quit on escape
 122      if (event.EventType == irr::EET_KEY_INPUT_EVENT)
 123 --- CEGUI-0.5.0/Samples/common/include/CEGuiIrrlichtBaseApplication.h.orig      2006-08-02 20:55:09.000000000 +0200
 124 +++ CEGUI-0.5.0/Samples/common/include/CEGuiIrrlichtBaseApplication.h   2007-12-26 17:58:28.983474838 +0100
 125 @@ -52,7 +52,7 @@ public:
 126      void    cleanup();
 127
 128      // irrlicht event listener
 129 -    bool OnEvent(irr::SEvent event);
 130 +    bool OnEvent(const irr::SEvent& event);
 131
 132  protected:
 133      irr::IrrlichtDevice*       d_device;