Skip to content

Commit b932651

Browse files
Merge pull request #10 from ksrgtech/arm64-macos
2 parents 8d95456 + 09ea15d commit b932651

2 files changed

Lines changed: 20 additions & 2 deletions

File tree

.github/workflows/build-all.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,24 @@ jobs:
1818
matrix:
1919
include:
2020
# 1.12.2 Forge builds
21+
- version: "1.12.2"
22+
os: macos-15-intel
23+
platform: macos
24+
# temurin does not provide JDK 8 series via their API: perhaps it's their bug?
25+
java_distribution: 'corretto'
26+
java_version: '8'
27+
build_script: build_lib_for_mac.sh
28+
gradle_cmd: ./gradlew
29+
mod_type: forge
30+
- version: "1.12.2"
31+
os: macos-15
32+
platform: macos
33+
# temurin does not provide JDK 8 series via their API: perhaps it's their bug?
34+
java_distribution: 'corretto'
35+
java_version: '8'
36+
build_script: build_lib_for_mac.sh
37+
gradle_cmd: ./gradlew
38+
mod_type: forge
2139
- version: "1.12.2"
2240
os: macos-14
2341
platform: macos
@@ -27,7 +45,7 @@ jobs:
2745
build_script: build_lib_for_mac.sh
2846
gradle_cmd: ./gradlew
2947
mod_type: forge
30-
48+
3149
# 1.18.2 Forge builds
3250
- version: "1.18.2"
3351
os: ubuntu-22.04

libcocoainput/darwin/libcocoainput/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CC = gcc
2-
CFLAGS = -Wall -fobjc-arc -mmacosx-version-min=10.10
2+
CFLAGS = -Wall -fobjc-arc -mmacosx-version-min=10.10 -arch x86_64 -arch arm64
33
FFLAGS = -framework Foundation -framework Cocoa
44
OBJS = cocoainput.o Logger.o DataManager.o MinecraftView.o
55
LIBS =

0 commit comments

Comments
 (0)