Skip to content

Commit

Permalink
ci: disable sdl2 on macOS to unbreak the build (#1343)
Browse files Browse the repository at this point in the history
More work is required to support building universal binaries.
  • Loading branch information
invertego authored Dec 12, 2023
1 parent 6e8f4f2 commit 6d5ef62
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions desktop-ui/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 15 additions & 7 deletions ruby/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 6d5ef62

Please sign in to comment.