Skip to content

Commit a3200be

Browse files
committed
Update definitions of OSes and architectures.
1 parent 98a741e commit a3200be

1 file changed

Lines changed: 58 additions & 18 deletions

File tree

dlls/bubblemod/BMOD_constants.h

Lines changed: 58 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#ifndef BMOD_CONSTANTS_H
2929
#define BMOD_CONSTANTS_H
30-
30+
#include "build.h"
3131
// ---------------------------------------------------------------
3232
// Branch customizations
3333
// Information in the next three constants will be used for servers
@@ -52,34 +52,74 @@
5252

5353
#define BMOD_VERSION "2.2.3a"
5454

55-
#if defined(_WIN32) && defined(_MSC_VER)
56-
#define BMOD_PLATFORM "WIN32"
57-
#elif defined(_WIN32) && defined(__MINGW32_)
58-
#define BMOD_PLATFORM "WIN32-MinGW"
59-
#elif defined(__ANDROID__)
55+
#if XASH_WIN32
56+
#define BMOD_PLATFORM "Win32"
57+
#elif XASH_DOS4GW
58+
#define BMOD_PLATFORM "DOS"
59+
#elif XASH_ANDROID
6060
#define BMOD_PLATFORM "Android"
61-
#elif defined(__APPLE__) && ( defined(__arm__) || defined(__aarch64__) )
62-
#define BMOD_PLATFORM "ios"
63-
#elif defined(__APPLE__)
61+
#elif XASH_IOS
62+
#define BMOD_PLATFORM "iOS"
63+
#elif XASH_APPLE
6464
#define BMOD_PLATFORM "Apple"
65-
#elif defined(__FreeBSD__)
65+
#elif XASH_FREEBSD
6666
#define BMOD_PLATFORM "FreeBSD"
67-
#elif defined(__NetBSD__)
67+
#elif XASH_NETBSD
6868
#define BMOD_PLATFORM "NetBSD"
69-
#elif defined(__OpenBSD__)
69+
#elif XASH_OPENBSD
7070
#define BMOD_PLATFORM "OpenBSD"
71-
#else
71+
#elif XASH_LINUX
7272
#define BMOD_PLATFORM "Linux"
73-
#endif
73+
#elif XASH_HAIKU
74+
#define BMOD_PLATFORM "Haiku"
75+
#elif XASH_SERENITY
76+
#define BMOD_PLATFORM "SerenityOS"
77+
#elif XASH_IRIX
78+
#define BMOD_PLATFORM "IRIX"
79+
#elif XASH_NSWITCH
80+
#define BMOD_PLATFORM "NSwitch"
81+
#elif XASH_PSVITA
82+
#define BMOD_PLATFORM "PSVita"
83+
#elif XASH_WASI
84+
#define BMOD_PLATFORM "WASI"
85+
#elif XASH_SUNOS
86+
#define BMOD_PLATFORM "SunOS(Solaris)"
87+
#elif XASH_EMSCRIPTEN
88+
#define BMOD_PLATFORM "Emscripten"
89+
#else
90+
#define BMOD_PLATFORM "os-unknown"
91+
#endif
7492

75-
#if defined(__amd64__) || defined(_M_X64)
93+
#if XASH_AMD64
7694
#define BMOD_ARCH "amd64"
77-
#elif defined(__aarch64__)
95+
#elif XASH_ARM >= 8
7896
#define BMOD_ARCH "arm64"
79-
#elif defined(__i386__) || defined(_X86_) || defined(_M_IX86)
97+
#elif XASH_X86
8098
#define BMOD_ARCH "i386"
81-
#elif defined(__arm__) || defined(_M_ARM)
99+
#elif XASH_ARM
82100
#define BMOD_ARCH "arm"
101+
#elif XASH_RISCV
102+
#if XASH_64BIT
103+
#define BMOD_ARCH "riscv64"
104+
else
105+
#define BMOD_ARCH "riscv32"
106+
#endif
107+
#elif XASH_MIPS
108+
#define BMOD_ARCH "mips"
109+
#elif XASH_E2K
110+
#define BMOD_ARCH "elbrus"
111+
#elif XASH_PPC
112+
#if XASH_64BIT
113+
#define BMOD_ARCH "powerpc64"
114+
#else
115+
#define BMOD_ARCH "powerpc"
116+
#endif
117+
#elif XASH_WASM
118+
#if XASH_64BIT
119+
#define BMOD_ARCH "wasm64"
120+
#else
121+
#define BMOD_ARCH "wasm"
122+
#endif
83123
#else
84124
#define BMOD_ARCH "arch-unknown"
85125
#endif

0 commit comments

Comments
 (0)