Fix cmake builds for different sysroots

macos/Dependencies/dependencies.make

@@ -6,9 +6,9 @@ LIBDIR := $(BUILD_PREFIX)/lib
 INCLUDEDIR := $(BUILD_PREFIX)/include
 DOWNLOADS := ${PWD}/downloads/$(HOST)
 NPROC := $(shell sysctl -n hw.ncpu)
-CFLAGS := -isysroot $(SDKROOT) -arch $(ARCH) -I$(INCLUDEDIR) $(TARGETFLAGS) $(DEFINES) -target $(HOST)
+CFLAGS := -arch $(ARCH) -isysroot $(SDKROOT) -I$(INCLUDEDIR) $(TARGETFLAGS) $(DEFINES)
 LDFLAGS := -L$(LIBDIR)
-CC      := $(shell xcrun -sdk $(SDK) -f clang) $(CFLAGS)
+CC      := $(shell xcrun -sdk $(SDK) --find clang)
 PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig
 GIT := git
 CLONE := $(GIT) clone
@@ -19,11 +19,21 @@ CONFIGURE_ENV := \
 	$(DEPLOYMENT_TARGET_ENV) \
 	PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	CC="$(CC)" LDFLAGS="$(LDFLAGS)"
+	CC="$(CC)" CXX="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 CONFIGURE_ARGS := \
 	--prefix="$(BUILD_PREFIX)" \
-	--host=$(HOST)
+	--host=$(HOST) \
+	--with-sysroot=$(SDKROOT)
+
+CMAKE_ENV := LDFLAGS="$(LDFLAGS)"
+
+CMAKE_ARGS := \
+	-DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \
+	-DCMAKE_C_COMPILER=$(CC) \
+	-DCMAKE_CXX_COMPILER=$(CC) \
+	-DCMAKE_OSX_SYSROOT=$(SDKROOT) \
+	-DCMAKE_C_FLAGS="$(CFLAGS)"
 
 RUBY_CONFIGURE_ARGS := \
 	--enable-install-static-library \
@@ -38,7 +48,8 @@ RUBY_CONFIGURE_ARGS := \
 
 CONFIGURE := $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS)
 AUTOGEN   := $(CONFIGURE_ENV) ./autogen.sh $(CONFIGURE_ARGS)
-CMAKE     := $(CONFIGURE_ENV) cmake .. -DCMAKE_INSTALL_PREFIX=$(BUILD_PREFIX)
+CMAKE     := $(CMAKE_ENV) cmake .. $(CMAKE_ARGS)
+
 MESON     := $(CONFIGURE_ENV) meson build --prefix=$(BUILD_PREFIX) -Ddefault_library=static
 
 default: deps-core
@@ -286,10 +297,10 @@ clean: clean-compiled
 powerwash: clean-compiled clean-downloads
 
 clean-downloads:
-	rm -rf downloads/
+	-rm -rf downloads/$(HOST)
 
 clean-compiled:
-	rm -rf build-*/
+	-rm -rf build-$(ARCH)/
 
 deps-core: libvorbis sigcxx pixman libpng libjpeg objfw physfs sdl2 sdl2image sdl2ttf 
 deps-binding: ruby

macos/mkxp-z.xcodeproj/project.pbxproj

@@ -674,8 +674,8 @@
 			isa = PBXGroup;
 			children = (
 				3B10ED592568E95D00372D13 /* lang-fun.h */,
-				3B10ED5A2568E95D00372D13 /* fake-api.mm */,
 				3B10ED5B2568E95D00372D13 /* lang-fun.mm */,
+				3B10ED5A2568E95D00372D13 /* fake-api.mm */,
 				3B10ED5C2568E95D00372D13 /* fake-api.h */,
 			);
 			path = system;

macos/mkxp-z.xcodeproj/xcuserdata/zoroark.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>Assets.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>Obtain Dependencies.xcscheme_^#shared#^_</key>
 		<dict>