commit 1c690eb7bc9b1659dd6cc2c526adf1bb2694839d
Author: Roman Fomin <rfomin@gmail.com>
AuthorDate: Sat Aug 3 15:35:53 2024 +0700
Commit: GitHub <noreply@github.com>
CommitDate: Sat Aug 3 10:35:53 2024 +0200
Build x86 version of the MacOS package (#1687)
---
.github/workflows/main.yml | 8 ++++++++
configure.ac | 8 ++++++--
pkg/osx/GNUmakefile | 8 +++++++-
pkg/win32/GNUmakefile | 2 +-
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4673550c..b421a572 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,6 +39,14 @@ jobs:
pkg-path: pkg/osx/*.dmg
pkg-dir: pkg/osx
+ - name: macOS x86 Clang
+ os: macos-13
+ compiler: clang
+ shell: bash
+ artifacts: true
+ pkg-path: pkg/osx/*.dmg
+ pkg-dir: pkg/osx
+
- name: MSYS2 UCRT64
os: windows-latest
compiler: gcc
diff --git a/configure.ac b/configure.ac
index 8f3f79f8..8ccb9f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,9 +34,13 @@ fi
AC_CANONICAL_TARGET
TARGET_OS=""
AS_CASE([$target_cpu],
- [x86_64|aarch64*],
+ [x86_64],
[
- TARGET_OS="64"
+ TARGET_OS="x64"
+ ],
+ [aarch64*|arm*],
+ [
+ TARGET_OS="arm"
],
[i?86|arm*],
[
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
index 188490d9..94e20830 100644
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -6,8 +6,14 @@ DOC_FILES += README.Strife.md NOT-BUGS.md
export MACOSX_DEPLOYMENT_TARGET=10.7
+ifeq ($(TARGET_OS),arm)
+ POSTFIX=arm64
+else
+ POSTFIX=x86
+endif
+
STAGING_DIR=staging
-DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).dmg
+DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-$(POSTFIX).dmg
TOPLEVEL=../..
TOPLEVEL_DOCS=$(patsubst %,../../%,$(DOC_FILES))
diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile
index e14f564e..8d55b85d 100644
--- a/pkg/win32/GNUmakefile
+++ b/pkg/win32/GNUmakefile
@@ -3,7 +3,7 @@ include ../config.make
TOPLEVEL=../..
-ifeq ($(TARGET_OS),64)
+ifeq ($(TARGET_OS),x64)
POSTFIX=win64
else
POSTFIX=win32