diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50b139f896..1bfeb58d03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,7 +114,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 + run: scripts/macos-make-universal.sh build=optimized local=false sdl2=false env: MAKEFLAGS: -j3 MACOS_CERTIFICATE_NAME: ${{ secrets.MACOS_CERTIFICATE_NAME }} diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile index e59401d526..cc959dd0ce 100644 --- a/desktop-ui/GNUmakefile +++ b/desktop-ui/GNUmakefile @@ -3,6 +3,7 @@ build := optimized threaded := true openmp := false vulkan := true +sdl2 := true local := true lto := true flags += -I. -I.. -I../ares -I../thirdparty -DMIA_LIBRARY diff --git a/ruby/GNUmakefile b/ruby/GNUmakefile index 7ded3a269b..785622f0ef 100644 --- a/ruby/GNUmakefile +++ b/ruby/GNUmakefile @@ -11,14 +11,18 @@ ifeq ($(ruby),) # TODO: Check presence of libSDL else pkg_check = $(if $(shell $(pkg_config) $1 && echo 1),$2) - ruby += $(call pkg_check,sdl2,input.sdl) - ruby += $(call pkg_check,sdl2,audio.sdl) + ifeq ($(sdl2),true) + ruby += $(call pkg_check,sdl2,input.sdl) + ruby += $(call pkg_check,sdl2,audio.sdl) + endif endif else ifeq ($(platform),macos) ruby += video.cgl ruby += audio.openal ruby += input.quartz #input.carbon - ruby += input.sdl + ifeq ($(sdl2),true) + ruby += input.sdl + endif else ifeq ($(platform),linux) pkg_check = $(if $(shell $(pkg_config) $1 && echo 1),$2) ruby += video.glx video.glx2 video.xshm @@ -30,8 +34,10 @@ ifeq ($(ruby),) ruby += $(call pkg_check,ao,audio.ao) ruby += input.xlib ruby += $(call pkg_check,libudev,input.udev) - ruby += $(call pkg_check,sdl2,input.sdl) - ruby += $(call pkg_check,sdl2,audio.sdl) + ifeq ($(sdl2),true) + ruby += $(call pkg_check,sdl2,input.sdl) + ruby += $(call pkg_check,sdl2,audio.sdl) + endif else ifeq ($(platform),bsd) pkg_check = $(if $(shell $(pkg_config) $1 && echo 1),$2) ruby += video.glx video.glx2 video.xshm @@ -42,8 +48,10 @@ ifeq ($(ruby),) ruby += $(call pkg_check,libpulse-simple,audio.pulseaudiosimple) ruby += $(call pkg_check,ao,audio.ao) ruby += input.uhid input.xlib - ruby += $(call pkg_check,sdl2,input.sdl) - ruby += $(call pkg_check,sdl2,audio.sdl) + ifeq ($(sdl2),true) + ruby += $(call pkg_check,sdl2,input.sdl) + ruby += $(call pkg_check,sdl2,audio.sdl) + endif endif endif