[SCM] Packaging the irrlicht game engine branch, debian/arch-support, updated. upstream/1.5-100-gfd1a010

Wed Feb 3 21:12:54 UTC 2010

The following commit has been merged in the debian/arch-support branch:
commit fd1a0104cedcc6cd37487f0eb5265d9865161e28
Merge: bc683e822c5ba7d06724344fc62047b761797fa2 9b70ffe54c77a2edcd984af52cda85f3a20fb4ee
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Wed Feb 3 19:33:48 2010 +0100

    Update to new Upstream Release

diff --combined include/IrrCompileConfig.h
index 2b07ea4,aa495b8..439ae15

--- a/include/IrrCompileConfig.h
+++ b/include/IrrCompileConfig.h
@@@ -7,12 -7,12 +7,12 @@@
  
  //! Irrlicht SDK Version
  #define IRRLICHT_VERSION_MAJOR 1
- #define IRRLICHT_VERSION_MINOR 6
+ #define IRRLICHT_VERSION_MINOR 7
  #define IRRLICHT_VERSION_REVISION 0
  // This flag will be defined only in SVN, the official release code will have
  // it undefined
- //#define IRRLICHT_VERSION_SVN
- #define IRRLICHT_SDK_VERSION "1.6"
+ //#define IRRLICHT_VERSION_SVN -beta
+ #define IRRLICHT_SDK_VERSION "1.7.0"
  
  #include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
  
@@@ -35,6 -35,7 +35,7 @@@
  //! _IRR_COMPILE_WITH_X11_DEVICE_ for Linux X11 based device
  //! _IRR_COMPILE_WITH_SDL_DEVICE_ for platform independent SDL framework
  //! _IRR_COMPILE_WITH_CONSOLE_DEVICE_ for no windowing system, used as a fallback
+ //! _IRR_COMPILE_WITH_FB_DEVICE_ for framebuffer systems
  
  
  //! Uncomment this line to compile with the SDL device
@@@ -85,15 -86,8 +86,12 @@@
  #endif
  
  #if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_)
- #if defined(__sun__)
- #define __BIG_ENDIAN__
- #define _IRR_SOLARIS_PLATFORM_
- #else
+ #ifndef _IRR_SOLARIS_PLATFORM_
  #define _IRR_LINUX_PLATFORM_
 +#include <endian.h>
 + #if __BYTE_ORDER == __BIG_ENDIAN
 +  #define __BIG_ENDIAN__
 + #endif
  #endif
  #define _IRR_POSIX_API_
  #define _IRR_COMPILE_WITH_X11_DEVICE_
@@@ -270,6 -264,8 +268,8 @@@ B3D, MS3D or X meshes *
  #define _IRR_COMPILE_WITH_MS3D_LOADER_
  //! Define _IRR_COMPILE_WITH_X_LOADER_ if you want to use Microsoft X files
  #define _IRR_COMPILE_WITH_X_LOADER_
+ //! Define _IRR_COMPILE_WITH_OGRE_LOADER_ if you want to load Ogre 3D files
+ #define _IRR_COMPILE_WITH_OGRE_LOADER_
  #endif
  
  //! Define _IRR_COMPILE_WITH_IRR_MESH_LOADER_ if you want to load Irrlicht Engine .irrmesh files
@@@ -298,8 -294,6 +298,6 @@@
  #define _IRR_COMPILE_WITH_OBJ_LOADER_
  //! Define _IRR_COMPILE_WITH_OCT_LOADER_ if you want to load FSRad OCT files
  #define _IRR_COMPILE_WITH_OCT_LOADER_
- //! Define _IRR_COMPILE_WITH_OGRE_LOADER_ if you want to load Ogre 3D files
- #define _IRR_COMPILE_WITH_OGRE_LOADER_
  //! Define _IRR_COMPILE_WITH_LWO_LOADER_ if you want to load Lightwave3D files
  #define _IRR_COMPILE_WITH_LWO_LOADER_
  //! Define _IRR_COMPILE_WITH_STL_LOADER_ if you want to load stereolithography files
@@@ -354,11 -348,43 +352,43 @@@
  #define _IRR_COMPILE_WITH_TGA_WRITER_
  
  //! Define __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_ if you want to open ZIP and GZIP archives
+ /** ZIP reading has several more options below to configure. */
  #define __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
+ #ifdef __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
+ //! Define _IRR_COMPILE_WITH_ZLIB_ to enable compiling the engine using zlib.
+ /** This enables the engine to read from compressed .zip archives. If you
+ disable this feature, the engine can still read archives, but only uncompressed
+ ones. */
+ #define _IRR_COMPILE_WITH_ZLIB_
+ //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the zlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
+ defined. */
+ #define _IRR_USE_NON_SYSTEM_ZLIB_
+ //! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
+ #define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
+ //! Define _IRR_COMPILE_WITH_BZIP2_ if you want to support bzip2 compressed zip archives
+ /** bzip2 is superior to the original zip file compression modes, but requires 
+ a certain amount of memory for decompression and adds several files to the
+ library. */
+ #define _IRR_COMPILE_WITH_BZIP2_
+ //! Define _IRR_USE_NON_SYSTEM_BZLIB_ to let irrlicht use the bzlib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the bzlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
+ defined. */
+ #define _IRR_USE_NON_SYSTEM_BZLIB_
+ //! Define _IRR_COMPILE_WITH_LZMA_ if you want to use LZMA compressed zip files.
+ /** LZMA is a very efficient compression code, known from 7zip. Irrlicht
+ currently only supports zip archives, though. */
+ #define _IRR_COMPILE_WITH_LZMA_
+ #endif
+ 
  //! Define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ if you want to mount folders as archives
  #define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
  //! Define __IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_ if you want to open ID software PAK archives
  #define __IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_
+ //! Define __IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_ if you want to open Nebula Device NPK archives
+ #define __IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_
  //! Define __IRR_COMPILE_WITH_TAR_ARCHIVE_LOADER_ if you want to open TAR archives
  #define __IRR_COMPILE_WITH_TAR_ARCHIVE_LOADER_
  
@@@ -479,7 -505,11 +509,7 @@@ precision will be lower but speed highe
  	#undef _IRR_WCHAR_FILESYSTEM
  #endif
  
 -#if defined(__sparc__) || defined(__sun__)
 -#define __BIG_ENDIAN__
 -#endif
 -
 -#if defined(_IRR_SOLARIS_PLATFORM_)
 +#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
  	#undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
  #endif
  

-- 
Packaging the irrlicht game engine

