build: add macOS SDL to thirdparty, add .dylib to bundle

.github/workflows/build.yml

@@ -87,20 +87,31 @@ jobs:
         keychain-password: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }}
     - name: Checkout source code
       uses: actions/checkout@v2
-    - name: "macOS: recover cache"
+    - name: "macOS: recover MoltenVK cache"
       if: runner.os == 'macOS'
       uses: actions/cache@v3
       env:
           cache-name: moltenvk
       with:
           path: thirdparty/MoltenVK/MoltenVK
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('thirdparty/MoltenVK/HEAD') }}
+    - name: "macOS: recover SDL cache"
+      if: runner.os == 'macOS'
+      uses: actions/cache@v3
+      env:
+          cache-name: sdl
+      with:
+          path: thirdparty/SDL/SDL
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('thirdparty/SDL/HEAD') }}
     - name: Install macOS Dependencies
       if: runner.os == 'macOS'
       run: |
-        brew install make ninja sdl2
+        brew install make ninja cmake
         pip install --no-input setuptools
         echo "MAKE=gmake" >> $GITHUB_ENV
+        pushd thirdparty/SDL
+        ./build-SDL.sh
+        popd
         pushd thirdparty/MoltenVK
         ./build-moltenvk.sh
         popd
@@ -114,7 +125,7 @@ jobs:
       run: ${MAKE:-make} -j4 -C desktop-ui build=optimized local=false compiler="${{ matrix.platform.compiler }}" windres="${{ matrix.platform.windres }}"
     - name: "macOS: Make universal app"
       if: runner.os == 'macOS'
-      run: scripts/macos-make-universal.sh build=optimized local=false sdl2=false
+      run: scripts/macos-make-universal.sh build=optimized local=false
       env:
         MAKEFLAGS: -j3
         MACOS_CERTIFICATE_NAME: ${{ secrets.MACOS_CERTIFICATE_NAME }}

ares/GNUmakefile

@@ -13,10 +13,6 @@ ares.objects := ares ares-fixed-allocator
 $(object.path)/ares.o: $(ares.path)/ares/ares.cpp
 $(object.path)/ares-fixed-allocator.o: $(ares.path)/ares/memory/fixed-allocator.cpp
 
-ifeq ($(platform),macos)
-  ares.dylibs :=
-endif
-
 ifeq ($(vulkan),true)
   flags += -DVULKAN
 endif

desktop-ui/GNUmakefile

@@ -22,6 +22,10 @@ ifneq ($(filter $(arch),x86 amd64),)
   endif
 endif
 
+ifeq ($(platform),macos)
+  ares.dylibs :=
+endif
+
 libco.path := ../libco
 include $(libco.path)/GNUmakefile
 

ruby/GNUmakefile

@@ -21,6 +21,11 @@ ifeq ($(ruby),)
     ruby += audio.openal
     ruby += input.quartz #input.carbon
     ifeq ($(sdl2),true)
+      macsdl = ../thirdparty/SDL/libSDL2-2.0.0.dylib
+      ares.dylibs += $(macsdl)
+      ifeq ($(wildcard $(macsdl)),)
+        $(error Tried to compile ruby for macOS with SDL2 linked, but no SDL2 library was found. Compile it with thirdparty/SDL/build-sdl.sh, or disable SDL by compiling ares with sdl2=false)
+      endif
       ruby += input.sdl
     endif
   else ifeq ($(platform),linux)

thirdparty/SDL/HEAD

@@ -0,0 +1 @@
+15ead9a40d09a1eb9972215cceac2bf29c9b77f6

thirdparty/SDL/build-sdl.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -euo pipefail
+
+if [ ! -d "SDL" ]; then
+    git clone https://github.com/libsdl-org/SDL.git -b SDL2
+else
+    git -C SDL fetch
+fi
+git -C SDL reset --hard "$(cat HEAD)"
+mkdir -p SDL/build
+pushd SDL/build
+cmake .. "-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
+          -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 #ares is currently built on Xcode 14.2, which has a minimum deploy target of 10.13
+cmake --build .
+sudo cmake --install .
+popd
+cp SDL/build/libSDL2-2.0.0.dylib .