Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .github/workflows/artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,20 @@ jobs:
[ -f ccache.tar.xz ] && tar xf ccache.tar.xz || true
[ -f workspacecache.tar ] && mv workspacecache.tar ${{ github.workspace }} || true
- name: Install Dependencies
run: brew install llvm@21 ccache
run: |
brew install llvm@21 ccache gmp mpfr mpc
# current homebrew cmake segfaults when building the ppc binary
wget -O- https://github.com/Kitware/CMake/releases/download/v4.2.3/cmake-4.2.3-macos-universal.tar.gz | tar -xz
- name: Build
run: |
[ -f workspacecache.tar ] && tar xf workspacecache.tar || true
LLVM_CONFIG="$(brew --prefix)/opt/llvm@21/bin/llvm-config" ./platforms/macos/build.sh
tar cf workspacecache.tar platforms/macos/build/work/toolchain
LLVM_CONFIG="$(brew --prefix)/opt/llvm@21/bin/llvm-config" \
GMP="$(brew --prefix)" \
MPFR="$(brew --prefix)" \
MPC="$(brew --prefix)" \
PATH="$PWD/cmake-4.2.3-macos-universal/CMake.app/Contents/bin:$PATH" \
./platforms/macos/build.sh
tar cf workspacecache.tar platforms/macos/build/work/toolchain platforms/macos/build/work/toolchain-ppc
mv workspacecache.tar ~
env:
NOSTRIP: 1
Expand Down
21 changes: 16 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,18 @@ jobs:
with:
submodules: true
- name: Install Dependencies
run: brew install llvm@21
run: |
brew install llvm@21 gmp mpfr mpc
# current homebrew cmake segfaults when building the ppc binary
wget -O- https://github.com/Kitware/CMake/releases/download/v4.2.3/cmake-4.2.3-macos-universal.tar.gz | tar -xz
- name: Build
run: LLVM_CONFIG="$(brew --prefix)/opt/llvm@21/bin/llvm-config" ./platforms/macos/build.sh
run: |
LLVM_CONFIG="$(brew --prefix)/opt/llvm@21/bin/llvm-config" \
GMP="$(brew --prefix)" \
MPFR="$(brew --prefix)" \
MPC="$(brew --prefix)" \
PATH="$PWD/cmake-4.2.3-macos-universal/CMake.app/Contents/bin:$PATH" \
./platforms/macos/build.sh
- name: Pack release
run: |
mv platforms/macos/build/ReMCPE .
Expand Down Expand Up @@ -144,7 +153,9 @@ jobs:
libssl-dev

- name: Build
run: ./platforms/ios/build.sh
run: |
./platforms/ios/build.sh
mv platforms/ios/build/ReMCPE.ipa ReMCPE-iOS.ipa
env:
CLANG: clang-21
AR: llvm-ar-21
Expand All @@ -154,7 +165,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ github.token }}
with:
asset_paths: '["platforms/ios/build/ReMCPE.ipa"]'
asset_paths: '["ReMCPE-iOS.ipa"]'

android:
strategy:
Expand Down Expand Up @@ -192,7 +203,7 @@ jobs:
env:
BUILD_TOOLS_VERSION: 36.1.0
- name: Rename APK
run: mv ${{ steps.sign_apk.outputs.signedReleaseFile }} ReMCPE.apk
run: mv ${{ steps.sign_apk.outputs.signedReleaseFile }} ReMCPE-Android.apk
- uses: alexellis/upload-assets@0.4.1
env:
GITHUB_TOKEN: ${{ github.token }}
Expand Down
10 changes: 4 additions & 6 deletions platforms/ios/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ fi
if [ "$(uname -s)" = "Darwin" ]; then
ar="${AR:-ar}"
ranlib="${RANLIB:-ranlib}"
strip='strip'
else
ar="${AR:-"llvm-ar"}"
ranlib="${RANLIB:-"llvm-ranlib"}"
strip='cctools-strip'
fi

for var in ar ranlib; do
Expand Down Expand Up @@ -124,10 +122,10 @@ if [ -n "$outdated_toolchain" ]; then
mv ld64/src/ld/ld ../../toolchain/bin/ld64.ld64
make -C libmacho -j"$ncpus"
make -C libstuff -j"$ncpus"
make -C misc strip lipo
make -C misc strip lipo -j"$ncpus"
strip misc/strip misc/lipo
cp misc/strip ../../toolchain/bin/cctools-strip
cp misc/lipo ../../toolchain/bin/lipo
mv misc/strip ../../toolchain/bin/cctools-strip
mv misc/lipo ../../toolchain/bin/lipo
cd ../..
rm -rf "cctools-port-$cctools_commit"

Expand Down Expand Up @@ -199,7 +197,7 @@ for target in $targets; do
done

lipo -create build-*/"$bin" -output "$bin"
[ -z "$DEBUG" ] && [ -z "$NOSTRIP" ] && "$strip" -no_code_signature_warning "$bin"
[ -z "$DEBUG" ] && [ -z "$NOSTRIP" ] && cctools-strip -no_code_signature_warning "$bin"
if command -v ldid >/dev/null; then
ldid -S"$entitlements" "$bin"
else
Expand Down
6 changes: 4 additions & 2 deletions platforms/macos/arch.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ int main(void) {
puts("i386");
#elif defined(__aarch64__)
puts("arm64");
#elif defined(__powerpc64__)
#elif defined(__POWERPC__)
#ifdef __LP64__
puts("ppc64");
#elif defined(__powerpc__)
#else
puts("powerpc");
#endif
#else
#error unknown mac architecture
#endif
Expand Down
Loading