From 1e440d078c771456d50b66e8317df9419bfc5b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= <lbphacker@gmail.com>
Date: Tue, 22 Feb 2022 06:56:02 +0100
Subject: [PATCH] IDENT_PLATFORM can now be MACOSARM

---
 meson.build           | 12 ++++++++++++
 src/Config.template.h | 19 +------------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/meson.build b/meson.build
index 600d52029..149c2a4f0 100644
--- a/meson.build
+++ b/meson.build
@@ -269,6 +269,16 @@ endif
 
 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('WIN', copt_platform == 'win')
 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('SERVER', '"' + get_option('server') + '"')
 conf_data.set('STATICSERVER', '"' + get_option('static_server') + '"')
+conf_data.set('IDENT_PLATFORM', '"' + copt_identplatform + '"')
+
 if get_option('update_server') != ''
 	conf_data.set('UPDATESERVER', '"' + get_option('update_server') + '"')
 else
diff --git a/src/Config.template.h b/src/Config.template.h
index 779bf1a39..20a0e5722 100644
--- a/src/Config.template.h
+++ b/src/Config.template.h
@@ -30,6 +30,7 @@
 #mesondefine SERVER
 #mesondefine STATICSERVER
 #mesondefine UPDATESERVER
+#mesondefine IDENT_PLATFORM
 
 #ifdef WIN
 # define PATH_SEP "\\"
@@ -66,24 +67,6 @@
 #define IDENT_RELTYPE "R"
 #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)
 #define IDENT_BUILD "SSE3"
 #elif defined(X86_SSE2)