[SCM] Packaging the irrlicht game engine branch, debian/arch-support, updated. upstream/1.5-121-g5e5021b
Christoph Egger
Christoph.Egger at gmx.de
Thu Feb 24 12:05:48 UTC 2011
The following commit has been merged in the debian/arch-support branch:
commit 5e5021be0631daf890bf0daf60ee823a483911f1
Merge: db3d32d900e96fbdd62c20a7d7d393813218148e 94416e1a5e96a18be7bdcf352a8bd6aeb7196258
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Sun Feb 20 14:35:18 2011 +0100
Merge commit 'refs/top-bases/debian/arch-support' into debian/arch-support
diff --combined include/IrrCompileConfig.h
index 81cabcd,83cab5c..976ccf0
--- a/include/IrrCompileConfig.h
+++ b/include/IrrCompileConfig.h
@@@ -1,4 -1,4 +1,4 @@@
- // Copyright (C) 2002-2009 Nikolaus Gebhardt
+ // Copyright (C) 2002-2010 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
@@@ -8,11 -8,11 +8,11 @@@
//! Irrlicht SDK Version
#define IRRLICHT_VERSION_MAJOR 1
#define IRRLICHT_VERSION_MINOR 7
- #define IRRLICHT_VERSION_REVISION 1
+ #define IRRLICHT_VERSION_REVISION 2
// 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.1"
+ #define IRRLICHT_VERSION_SVN -beta
+ #define IRRLICHT_SDK_VERSION "1.7.2"
#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_
@@@ -105,9 -101,9 +105,9 @@@
//! Define _IRR_COMPILE_WITH_DIRECT3D_8_ and _IRR_COMPILE_WITH_DIRECT3D_9_ to
//! compile the Irrlicht engine with Direct3D8 and/or DIRECT3D9.
- /** If you only want to use the software device or opengl this can be useful.
+ /** If you only want to use the software device or opengl you can disable those defines.
This switch is mostly disabled because people do not get the g++ compiler compile
- directX header files, and directX is only available on windows platforms. If you
+ directX header files, and directX is only available on Windows platforms. If you
are using Dev-Cpp, and want to compile this using a DX dev pack, you can define
_IRR_COMPILE_WITH_DX9_DEV_PACK_. So you simply need to add something like this
to the compiler settings: -DIRR_COMPILE_WITH_DX9_DEV_PACK
@@@ -121,7 -117,7 +121,7 @@@ headers, e.g. Summer 2004. This is a M
#if defined(_IRR_WINDOWS_API_) && (!defined(__GNUC__) || defined(IRR_COMPILE_WITH_DX9_DEV_PACK))
//! Only define _IRR_COMPILE_WITH_DIRECT3D_8_ if you have an appropriate DXSDK, e.g. Summer 2004
- #define _IRR_COMPILE_WITH_DIRECT3D_8_
+ //#define _IRR_COMPILE_WITH_DIRECT3D_8_
#define _IRR_COMPILE_WITH_DIRECT3D_9_
#endif
@@@ -368,7 -364,7 +368,7 @@@ defined. *
//! 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
+ /** 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_
@@@ -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