From e89311954ff7cd1b3eb871f98871c7064620a227 Mon Sep 17 00:00:00 2001 From: kreatordxx <> Date: Mon, 9 Apr 2007 01:16:31 +0000 Subject: [PATCH] move determination of WORDS_BIG_ENDIAN to pstypes.h as SCons can't do it (as far as I know). SCons doesn't make conf.h --- arch/carbon/conf.h | 8 -------- dxx-changelog.txt | 4 ++++ include/pstypes.h | 12 ++++++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/arch/carbon/conf.h b/arch/carbon/conf.h index 8935fee1d..668d993c8 100755 --- a/arch/carbon/conf.h +++ b/arch/carbon/conf.h @@ -103,14 +103,6 @@ /* Version number of package */ #define VERSION "0.5.0" -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#ifdef __LITTLE_ENDIAN__ // Intel Macs -# define WORDS_BIGENDIAN 0 -#else -# define WORDS_BIGENDIAN 1 -#endif - /* Define if your processor needs data to be word-aligned */ /* #undef WORDS_NEED_ALIGNMENT */ diff --git a/dxx-changelog.txt b/dxx-changelog.txt index c415ea89f..b1f0cfc79 100755 --- a/dxx-changelog.txt +++ b/dxx-changelog.txt @@ -1,5 +1,9 @@ D2X-Rebirth Changelog +20070409 +-------- +arch/carbon/conf.h, include/pstypes.h: move determination of WORDS_BIG_ENDIAN to pstypes.h as SCons can't do it (as far as I know). SCons doesn't make conf.h + 20070407 -------- main/newmenu.c: hide cursor after newmenu_get_filename() diff --git a/include/pstypes.h b/include/pstypes.h index 08ed8db5d..29dd4f42e 100755 --- a/include/pstypes.h +++ b/include/pstypes.h @@ -91,6 +91,18 @@ typedef ubyte bool; // the following stuff has nothing to do with types but needed everywhere, // and since this file is included everywhere, it's here. +#if defined(__i386__) || defined(__ia64__) || defined(WIN32) || \ +(defined(__alpha__) || defined(__alpha)) || \ +defined(__arm__) || defined(ARM) || \ +(defined(__mips__) && defined(__MIPSEL__)) || \ +defined(__SYMBIAN32__) || \ +defined(__x86_64__) || \ +defined(__LITTLE_ENDIAN__) // from physfs_internal.h +//# define WORDS_BIGENDIAN 0 +#else +# define WORDS_BIGENDIAN 1 +#endif + #ifdef __GNUC__ # define __pack__ __attribute__((packed)) #elif defined(_MSC_VER)