diff options
| author | Tim Angus <tim@ngus.net> | 2016-04-09 17:57:28 +0100 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2016-04-09 17:57:28 +0100 |
| commit | f45fbef604e05144057dec8d1dbfc5d4f5a2a822 (patch) | |
| tree | 152d2a428b078f7a89756ea9e156695fc69f1686 /src/qcommon/q_platform.h | |
| parent | 7f9e97d611b4b267d9dd913144cb9632f96c90c2 (diff) | |
| parent | 87abdd914988724e164ffb16380ad26be8420b84 (diff) | |
Merge branch 'master' into gpp
Diffstat (limited to 'src/qcommon/q_platform.h')
| -rw-r--r-- | src/qcommon/q_platform.h | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/src/qcommon/q_platform.h b/src/qcommon/q_platform.h index 39d1672c..34a93626 100644 --- a/src/qcommon/q_platform.h +++ b/src/qcommon/q_platform.h @@ -170,50 +170,29 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA //================================================================= LINUX === -#if defined(__linux__) || defined(__FreeBSD_kernel__) +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) #include <endian.h> #if defined(__linux__) #define OS_STRING "linux" -#else +#elif defined(__FreeBSD_kernel__) #define OS_STRING "kFreeBSD" +#else +#define OS_STRING "GNU" #endif #define ID_INLINE inline #define PATH_SEP '/' -#if defined __i386__ -#define ARCH_STRING "x86" -#elif defined __x86_64__ +#if !defined(ARCH_STRING) +# error ARCH_STRING should be defined by the Makefile +#endif + +#if defined __x86_64__ #undef idx64 #define idx64 1 -#define ARCH_STRING "x86_64" -#elif defined __powerpc64__ -#define ARCH_STRING "ppc64" -#elif defined __powerpc__ -#define ARCH_STRING "ppc" -#elif defined __s390__ -#define ARCH_STRING "s390" -#elif defined __s390x__ -#define ARCH_STRING "s390x" -#elif defined __ia64__ -#define ARCH_STRING "ia64" -#elif defined __alpha__ -#define ARCH_STRING "alpha" -#elif defined __sparc__ -#define ARCH_STRING "sparc" -#elif defined __arm__ -#define ARCH_STRING "arm" -#elif defined __cris__ -#define ARCH_STRING "cris" -#elif defined __hppa__ -#define ARCH_STRING "hppa" -#elif defined __mips__ -#define ARCH_STRING "mips" -#elif defined __sh__ -#define ARCH_STRING "sh" #endif #if __FLOAT_WORD_ORDER == __BIG_ENDIAN |