Use autoconf macro

rfomin · Nov 24, 2023 · 0e26c4a · 0e26c4a
1 parent 4986518
commit 0e26c4a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -31,6 +31,19 @@ then
         CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
 fi
 
+AC_CANONICAL_TARGET
+TARGET_OS=""
+AS_CASE([$target_cpu],
+        [x86_64|aarch64*],
+        [
+            TARGET_OS="64"
+        ],
+        [i?86|arm*],
+        [
+            TARGET_OS="32"
+        ])
+AC_SUBST([TARGET_OS])
+
 PKG_CHECK_MODULES(SDL, [sdl2 >= 2.0.14])
 # Check for SDL2_mixer
 AC_ARG_ENABLE([sdl2mixer],

diff --git a/pkg/config.make.in b/pkg/config.make.in
@@ -19,6 +19,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 
+TARGET_OS = @TARGET_OS@
+
 # Documentation files to distribute with packages.
 
 DOC_FILES = README.md        \

diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile
@@ -3,8 +3,7 @@ include ../config.make
 
 TOPLEVEL=../..
 
-SYS:=$(shell uname)
-ifneq (, $(findstring MINGW64, $(SYS)))
+ifeq ($(TARGET_OS),64)
     POSTFIX=win64
 else
     POSTFIX=win32