diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml index 7dba9cd..bf4cdc0 100644 --- a/.github/workflows/buildReleaseInclDocker.yml +++ b/.github/workflows/buildReleaseInclDocker.yml @@ -139,9 +139,9 @@ jobs: linux: needs: [inputs, sentry] - if: | - needs.sentry.outputs.release_not_built == 'true' - || needs.inputs.outputs.force == 'true' + if: ${{ false }} +# needs.sentry.outputs.release_not_built == 'true' +# || needs.inputs.outputs.force == 'true' runs-on: ubuntu-latest @@ -297,10 +297,11 @@ jobs: id: tag uses: ./../actions/release-tag-action - # Install X11 dependencies + # Install X11 and SDL dependencies - name: Install X11 dependencies on MacOS - if: ${{ runner.os == 'macOS'}} - run: brew install --cask xquartz + run: | + brew install --cask xquartz + brew install SDL2 # Build maiko - name: Build @@ -308,12 +309,14 @@ jobs: run: | export LDEARCH=x86_64-apple-darwin ./makeright x + ./makeright sdl ./makeright init export LDEARCH=aarch64-apple-darwin - ./makeright x + ./makeright x + ./makeright sdl ./makeright init mkdir -p ../darwin.universal - for exe in ldeinit lde ldex + for exe in ldeinit lde ldex ldesdl do lipo -create \ -arch arm64 ../darwin.aarch64/${exe} \ diff --git a/bin/makefile-darwin.aarch64-sdl b/bin/makefile-darwin.aarch64-sdl index dc56a02..a527eb7 100644 --- a/bin/makefile-darwin.aarch64-sdl +++ b/bin/makefile-darwin.aarch64-sdl @@ -1,6 +1,6 @@ -# Options for MacOS, x86 processor, SDL +# Options for MacOS, arm64 (aka aarch64) processor, SDL -CC = clang $(CLANG_CFLAGS) +CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS) XFILES = $(OBJECTDIR)sdl.o diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x index f8948a0..867eb5d 100644 --- a/bin/makefile-darwin.aarch64-x +++ b/bin/makefile-darwin.aarch64-x @@ -1,6 +1,6 @@ -# Options for MacOS, arm64 (aka aarch64) processor, X windows +# Options for MacOS, arm64 (aka aarch64) processor, X windows -CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS) +CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS) XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xbbt.o \ diff --git a/bin/makefile-darwin.x86_64-sdl b/bin/makefile-darwin.x86_64-sdl index 94604b0..f84e13e 100644 --- a/bin/makefile-darwin.x86_64-sdl +++ b/bin/makefile-darwin.x86_64-sdl @@ -1,6 +1,6 @@ # Options for MacOS, x86 processor, SDL -CC = clang -m64 $(CLANG_CFLAGS) +CC = clang -m64 -target x86_64-apple-darwin $(CLANG_CFLAGS) XFILES = $(OBJECTDIR)sdl.o