mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-11 19:04:05 +02:00
Code Issues Projects Releases Wiki Activity

IDENT_PLATFORM can now be MACOSARM

Browse Source
This commit is contained in:
Tamás Bálint Misius
2022-02-22 06:56:02 +01:00
parent 477909d00f
commit 1e440d078c
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@@ -269,6 +269,16 @@ endif
project_inc = include_directories([ 'src', 'data', 'resources' ]) project_inc = include_directories([ 'src', 'data', 'resources' ])
if copt_platform == 'win'
copt_identplatform = copt_64bit ? 'WIN64' : 'WIN32'
elif copt_platform == 'lin'
copt_identplatform = copt_64bit ? 'LIN64' : 'LIN32'
elif copt_platform == 'mac'
copt_identplatform = copt_architecture == 'arm64' ? 'MACOSARM' : 'MACOSX'
else
copt_identplatform = 'UNKNOWN'
endif
conf_data.set('LIN', copt_platform == 'lin') conf_data.set('LIN', copt_platform == 'lin')
conf_data.set('WIN', copt_platform == 'win') conf_data.set('WIN', copt_platform == 'win')
conf_data.set('MACOSX', copt_platform == 'mac') conf_data.set('MACOSX', copt_platform == 'mac')
@@ -290,6 +300,8 @@ conf_data.set('SNAPSHOT', get_option('snapshot'))
conf_data.set('SNAPSHOT_ID', get_option('snapshot_id')) conf_data.set('SNAPSHOT_ID', get_option('snapshot_id'))
conf_data.set('SERVER', '"' + get_option('server') + '"') conf_data.set('SERVER', '"' + get_option('server') + '"')
conf_data.set('STATICSERVER', '"' + get_option('static_server') + '"') conf_data.set('STATICSERVER', '"' + get_option('static_server') + '"')
conf_data.set('IDENT_PLATFORM', '"' + copt_identplatform + '"')
if get_option('update_server') != '' if get_option('update_server') != ''
conf_data.set('UPDATESERVER', '"' + get_option('update_server') + '"') conf_data.set('UPDATESERVER', '"' + get_option('update_server') + '"')
else else

19
src/Config.template.h
View File

@@ -30,6 +30,7 @@
#mesondefine SERVER #mesondefine SERVER
#mesondefine STATICSERVER #mesondefine STATICSERVER
#mesondefine UPDATESERVER #mesondefine UPDATESERVER
#mesondefine IDENT_PLATFORM
#ifdef WIN #ifdef WIN
# define PATH_SEP "\\" # define PATH_SEP "\\"
@@ -66,24 +67,6 @@
#define IDENT_RELTYPE "R" #define IDENT_RELTYPE "R"
#endif #endif
#if defined(WIN)
#if defined(_64BIT)
#define IDENT_PLATFORM "WIN64"
#else
#define IDENT_PLATFORM "WIN32"
#endif
#elif defined(LIN)
#if defined(_64BIT)
#define IDENT_PLATFORM "LIN64"
#else
#define IDENT_PLATFORM "LIN32"
#endif
#elif defined(MACOSX)
#define IDENT_PLATFORM "MACOSX"
#else
#define IDENT_PLATFORM "UNKNOWN"
#endif
#if defined(X86_SSE3) #if defined(X86_SSE3)
#define IDENT_BUILD "SSE3" #define IDENT_BUILD "SSE3"
#elif defined(X86_SSE2) #elif defined(X86_SSE2)