patch osx build

NOTE: This bumps the minimum supported verision of macOS to 11.1 (BigSur)

Author: HeliumAnt

.github/workflows/meson.yml

@@ -36,7 +36,7 @@ on:
       macosx-deployment-target:
         type: string
         required: false
-        default: "10.15"
+        default: "11.1"
 
   # Triggers the workflow when called by a top-level workflow
   workflow_call:
@@ -63,7 +63,7 @@ on:
       macosx-deployment-target:
         type: string
         required: false
-        default: "10.15"
+        default: "11.1"
 
 jobs:
   build-linux:
@@ -178,7 +178,7 @@ jobs:
           echo "::group::Installing pkg-config"
           sudo apt install pkg-config
           echo "::group::Installing mac deps"
-          omp install libsdl2 libsdl2_image onetbb lz4 libpng minizip luajit flac
+          omp install SDL3 onetbb lz4 libpng minizip luajit flac
           echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
           echo "::endgroup::"
           echo "::group::Installing meson"

external/sources/luabind-0.7.1/meson.build

@@ -13,7 +13,7 @@ deps = []
 cxx = meson.get_compiler('cpp')
 if cxx.get_argument_syntax() == 'gcc'
   cpp_args = ['-w', '-fpermissive']
-  luabind_args = cpp_args
+  luabind_args += cpp_args
 elif cxx.get_argument_syntax() == 'msvc'
   cpp_args = ['-permissive', '-DBOOST_BIND_GLOBAL_PLACEHOLDERS=1', '-DLUABIND_BUILDING', '-D_ITERATOR_DEBUG_LEVEL=0']
   luabind_args = ['-D_HAS_AUTO_PTR_ETC=1', '-DBOOST_BIND_GLOBAL_PLACEHOLDERS=1', '-permissive']

meson.build

@@ -230,9 +230,13 @@ subdir('external')
 sdl3_opt = cmake.subproject_options()
 sdl3_opt.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'), 'BUILD_SHARED_LIBS':false, 'BUILD_STATIC_LIBS': true})
 sdl3_opt.append_compile_args('c','-DUSE_XINPUT2_KEYBOARD')
-sdl3_proj = cmake.subproject('SDL3-3.2.10', options: sdl3_opt)
-sdl3_dep = sdl3_proj.dependency('SDL3-static')
-meson.override_dependency('sdl3', sdl3_dep)
+if host_machine.system() == 'darwin'
+  sdl3_dep = dependency('sdl3')
+else
+  sdl3_proj = cmake.subproject('SDL3-3.2.10', options: sdl3_opt)
+  sdl3_dep = sdl3_proj.dependency('SDL3-static')
+  meson.override_dependency('sdl3', sdl3_dep)
+endif
 
 sdl3_image_proj = subproject('SDL3_image-3.2.4')
 sdl3_image_dep = sdl3_image_proj.get_variable('sdl3_image_dep')