[SCM] Packaging the irrlicht game engine branch, debian/arch-support, updated. upstream/1.5-113-gdb3d32d
Christoph Egger
Christoph.Egger at gmx.de
Mon Mar 1 15:59:32 UTC 2010
The following commit has been merged in the debian/arch-support branch:
commit db3d32d900e96fbdd62c20a7d7d393813218148e
Merge: fd1a0104cedcc6cd37487f0eb5265d9865161e28 fbaa5d75d0f0554399150765f3d02ae351b53b21
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Mon Mar 1 16:26:02 2010 +0100
Merge commit 'refs/top-bases/debian/arch-support' into debian/arch-support
diff --combined include/IrrCompileConfig.h
index 439ae15,7421f96..81cabcd
--- a/include/IrrCompileConfig.h
+++ b/include/IrrCompileConfig.h
@@@ -8,11 -8,11 +8,11 @@@
//! Irrlicht SDK Version
#define IRRLICHT_VERSION_MAJOR 1
#define IRRLICHT_VERSION_MINOR 7
- #define IRRLICHT_VERSION_REVISION 0
+ #define IRRLICHT_VERSION_REVISION 1
// This flag will be defined only in SVN, the official release code will have
// it undefined
//#define IRRLICHT_VERSION_SVN -beta
- #define IRRLICHT_SDK_VERSION "1.7.0"
+ #define IRRLICHT_SDK_VERSION "1.7.1"
#include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
@@@ -88,10 -88,6 +88,10 @@@
#if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_)
#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_
@@@ -364,7 -360,7 +364,7 @@@ ones. *
/** 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_
+ #undef _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
@@@ -376,11 -372,11 +376,11 @@@ library. *
/** 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_
+ #undef _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_
+ #undef _IRR_COMPILE_WITH_LZMA_
#endif
//! Define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ if you want to mount folders as archives
@@@ -509,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
More information about the Pkg-games-commits
mailing list