Skip to content

Commit fbcfaec

Browse files
committed
use native libexpat on macos
1 parent 605327f commit fbcfaec

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

.github/workflows/release.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@ jobs:
6666
mv SDK ../
6767
git clone https://github.com/hotbso/xplib.git ../xplib
6868
69-
- uses: melusina-org/setup-macports@v1
70-
if: startsWith(matrix.os, 'macos')
71-
with:
72-
macports-version: 2.11.4
73-
7469
- name: Build Executable
7570
shell: bash
7671
env:
@@ -82,8 +77,6 @@ jobs:
8277
fi
8378
8479
if [ $OS == "macos-15" ]; then
85-
#port selfupdate
86-
port install expat +universal
8780
make -f Makefile.mac64
8881
else
8982
make -f Makefile.lin64

Makefile.mac64

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ OBJECTS_x86=$(OBJECTS_arm:.o_arm=.o_x86)
1515
# if we run this script on Linux it's osxcross
1616
UNAME_S := $(shell uname -s)
1717
ifeq ($(UNAME_S),Darwin)
18-
CCx=clang -target x86_64-apple-macos14
19-
CCa=clang -target arm64-apple-macos14
18+
CCx=clang -target x86_64-apple-macos15
19+
CCa=clang -target arm64-apple-macos15
2020

21-
CXXx=clang++ -target x86_64-apple-macos14
22-
CXXa=clang++ -target arm64-apple-macos14
23-
LIBEXPAT=/opt/local/lib/libexpat.a
21+
CXXx=clang++ -target x86_64-apple-macos15
22+
CXXa=clang++ -target arm64-apple-macos15
23+
LIBEXPAT=-lexpat
2424
else
2525
PATH:=/osxcross/target/bin:$(PATH)
2626
CCx=o64-clang -mmacosx-version-min=13.0

0 commit comments

Comments
 (0)