From ead4088c88df75d4ba229236d6a10f786d6059ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=BE=E3=83=AD=E3=82=A2=E3=83=BC=E3=82=AF?= Date: Thu, 26 Nov 2020 00:30:37 -0500 Subject: [PATCH] Fix building SDL for iOS --- macos/Dependencies/.iOS | 2 +- macos/Dependencies/dependencies.make | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/macos/Dependencies/.iOS b/macos/Dependencies/.iOS index 1a55a259..b3fe098f 100644 --- a/macos/Dependencies/.iOS +++ b/macos/Dependencies/.iOS @@ -1,6 +1,6 @@ SDK := iphoneos ARCH := armv7 -HOST := $(ARCH)-iphone-darwin +HOST := $(ARCH)-ios-darwin MINIMUM_REQUIRED := 10.0 SDL_FLAGS := ${SDL_FLAGS} diff --git a/macos/Dependencies/dependencies.make b/macos/Dependencies/dependencies.make index 599120a8..4c5a893e 100644 --- a/macos/Dependencies/dependencies.make +++ b/macos/Dependencies/dependencies.make @@ -172,8 +172,7 @@ $(DOWNLOADS)/sdl2/configure: $(DOWNLOADS)/sdl2/autogen.sh cd $(DOWNLOADS)/sdl2; ./autogen.sh $(DOWNLOADS)/sdl2/autogen.sh: - $(CLONE) $(GITHUB)/SDL-mirror/SDL $(DOWNLOADS)/sdl2; \ - cd $(DOWNLOADS)/sdl2; git checkout 49052b8a81be445eb178be5270db6b3ed140d9f5 + $(CLONE) $(GITLAB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z; cd $(DOWNLOADS)/sdl2 # SDL2 (Image) sdl2image: init_dirs sdl2 libpng libjpeg $(LIBDIR)/libSDL2_image.a @@ -277,7 +276,7 @@ custom-ruby-configure: $(RUBY_PATH)/*.c # ==== init_dirs: - mkdir -p $(LIBDIR) $(INCLUDEDIR) + @mkdir -p $(LIBDIR) $(INCLUDEDIR) clean: clean-compiled