diff --git a/.gitmodules b/.gitmodules index e1d6abb5..580b490a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "boost-unordered"] path = boost-unordered - url = https://gitlab.com/zzoro/mkxp-z-boost-unordered.git + url = https://gitlab.com/mkxp-z/boost-unordered.git diff --git a/macos/.gitignore b/macos/.gitignore index 47e2eeb0..b9274c89 100644 --- a/macos/.gitignore +++ b/macos/.gitignore @@ -1,5 +1,2 @@ DerivedData/ -*Dependencies/ -*Dependencies.dmg -gls* -*.dmg \ No newline at end of file +gls* \ No newline at end of file diff --git a/macos/Config.xcconfig b/macos/Config.xcconfig index b7fc7905..febd893d 100644 --- a/macos/Config.xcconfig +++ b/macos/Config.xcconfig @@ -9,46 +9,33 @@ // GCC_PREPROCESSOR_DEFINITIONS = $(inherited) EASY_POKE // The path to your build dependencies, or the included (and mounted) .dmg -DEPENDENCY_SEARCH_PATH = $(PROJECT_DIR)/MKXPZ-Dependencies/mac +DEPENDENCY_SEARCH_PATH = $(PROJECT_DIR)/Dependencies/build-$(CURRENT_ARCH) -// The version of Ruby to use -// It's really only important for the disk image, -// if you install Ruby yourself just change paths in the project on your own -RUBY_INSTALL_PREFIX = $(DEPENDENCY_SEARCH_PATH)/prefix/opt/ruby$(MRI_VERSION) - -// Default, don't change this here, change it in the target settings -MRI_VERSION=2.7.0 +// Don't change this here +MRI_VERSION = 2.6.0 INFOPLIST_FILE = $(PROJECT_DIR)/Info.plist CODE_SIGN_ENTITLEMENTS = $(PROJECT_DIR)/entitlements.plist OTHER_CFLAGS = -fconstant-string-class=OFConstantString -fno-constant-cfstrings $(inherited) CLANG_ENABLE_MODULES = NO -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) MKXPZ_BUILD_XCODE ALCDEVICE_STRUCT=ALCdevice_struct SHARED_FLUID USE_MINIFFI +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) MKXPZ_BUILD_XCODE ALCDEVICE_STRUCT=ALCdevice_struct USE_MINIFFI GCC_C_LANGUAGE_STANDARD = gnu11 GCC_CXX_LANGUAGE_STANDARD = c++11 -LIBRARY_SEARCH_PATHS = "$(RUBY_INSTALL_PREFIX)/lib" "$(DEPENDENCY_SEARCH_PATH)/prefix/lib" "$(DEPENDENCY_SEARCH_PATH)/prefix/lib64" -HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../**" "$(DEPENDENCY_SEARCH_PATH)/prefix/include" "$(DEPENDENCY_SEARCH_PATH)/prefix/lib/**" - +HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../**" "$(DEPENDENCY_SEARCH_PATH)/include" "$(DEPENDENCY_SEARCH_PATH)/lib/**" +LIBRARY_SEARCH_PATHS = "$(DEPENDENCY_SEARCH_PATH)/lib" // Project includes -EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = $(inherited) MKXPZ-Dependencies ../build +EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = $(inherited) Dependencies ../build + +HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/include/SDL2" // sigc++ -HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/prefix/include/sigc++-2.0" +HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/include/sigc++-2.0" // pixman -HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/prefix/include/pixman-1" - -// Usually you need to access Framework headers like "SDL2/SDL.h" -// MKXP's source isn't written with macOS in mind though, -// so gotta search the framework headers -HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/frameworks/SDL2.framework/Headers/**" -HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/frameworks/SDL2_ttf.framework/Headers/**" -HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/frameworks/SDL2_image.framework/Headers/**" - -FRAMEWORK_SEARCH_PATHS = "$(DEPENDENCY_SEARCH_PATH)/frameworks" $(inherited) +HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/include/pixman-1" // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 diff --git a/macos/Dependencies/.AppleSilicon b/macos/Dependencies/.AppleSilicon new file mode 100644 index 00000000..8009bd3b --- /dev/null +++ b/macos/Dependencies/.AppleSilicon @@ -0,0 +1,6 @@ +SDK := macosx +ARCH := arm64 +HOST := aarch64-apple-darwin +MINIMUM_REQUIRED := 11.0 + +include dependencies.make diff --git a/macos/Dependencies/.Intel b/macos/Dependencies/.Intel new file mode 100644 index 00000000..a095b8f5 --- /dev/null +++ b/macos/Dependencies/.Intel @@ -0,0 +1,6 @@ +SDK := macosx +ARCH := x86_64 +HOST := $(ARCH)-apple-darwin +MINIMUM_REQUIRED := 10.12 + +include dependencies.make diff --git a/macos/Dependencies/.gitignore b/macos/Dependencies/.gitignore new file mode 100644 index 00000000..40903e8e --- /dev/null +++ b/macos/Dependencies/.gitignore @@ -0,0 +1,3 @@ +build-*/ +downloads/ +*.dmg \ No newline at end of file diff --git a/macos/Dependencies/.iOS b/macos/Dependencies/.iOS new file mode 100644 index 00000000..ab86bf2d --- /dev/null +++ b/macos/Dependencies/.iOS @@ -0,0 +1,6 @@ +SDK := iphoneos +ARCH := armv7 +HOST := $(ARCH)-iphone-darwin +MINIMUM_REQUIRED := 10.0 + +include dependencies.make diff --git a/macos/Dependencies/Brewfile b/macos/Dependencies/Brewfile new file mode 100644 index 00000000..830e7d10 --- /dev/null +++ b/macos/Dependencies/Brewfile @@ -0,0 +1,8 @@ +# https://github.com/Homebrew/homebrew-bundle + +brew "libtool" +brew "mm-common" +brew "cmake" +brew "automake" +brew "autoconf" +brew "nasm" \ No newline at end of file diff --git a/macos/Dependencies/dependencies.make b/macos/Dependencies/dependencies.make new file mode 100644 index 00000000..198b65c4 --- /dev/null +++ b/macos/Dependencies/dependencies.make @@ -0,0 +1,296 @@ +SDKROOT := $(shell xcrun -sdk $(SDK) --show-sdk-path) +TARGETFLAGS := $(TARGETFLAGS) -m$(SDK)-version-min=$(MINIMUM_REQUIRED) +DEPLOYMENT_TARGET_ENV := $(shell ruby -e 'puts "$(SDK)".upcase')_DEPLOYMENT_TARGET=$(MINIMUM_REQUIRED) +BUILD_PREFIX := ${PWD}/build-$(ARCH) +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) +LDFLAGS := -L$(LIBDIR) +CC := $(shell xcrun -sdk $(SDK) -f clang) $(CFLAGS) +PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig +GIT := git +CLONE := $(GIT) clone +GITHUB := https://github.com +GITLAB := https://gitlab.com + +CONFIGURE_ENV := \ + $(DEPLOYMENT_TARGET_ENV) \ + PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ + CC="$(CC)" LDFLAGS="$(LDFLAGS)" + +CONFIGURE_ARGS := \ + --prefix="$(BUILD_PREFIX)" \ + --host=$(HOST) + +RUBY_CONFIGURE_ARGS := \ + --enable-install-static-library \ + --enable-shared \ + --disable-install-doc \ + --with-out-ext=openssl \ + --with-out-ext=fiddle \ + --with-out-ext=gdbm \ + --disable-rubygems \ + --with-static-linked-ext \ + ${EXTRA_RUBY_CONFIG_ARGS} + +CONFIGURE := $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) +AUTOGEN := $(CONFIGURE_ENV) ./autogen.sh $(CONFIGURE_ARGS) +CMAKE := $(CONFIGURE_ENV) cmake .. -DCMAKE_INSTALL_PREFIX=$(BUILD_PREFIX) +MESON := $(CONFIGURE_ENV) meson build --prefix=$(BUILD_PREFIX) -Ddefault_library=static + +default: deps-core + +# Vorbis +libvorbis: init_dirs libogg $(LIBDIR)/libvorbis.a + +$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/Makefile + cd $(DOWNLOADS)/vorbis; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/configure + cd $(DOWNLOADS)/vorbis; \ + $(CONFIGURE) --with-ogg=$(BUILD_PREFIX) --enable-shared=false --enable-static=true + +$(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh + cd $(DOWNLOADS)/vorbis; \ + ./autogen.sh + +$(DOWNLOADS)/vorbis/autogen.sh: + $(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis + + +# Ogg, dependency of Vorbis +libogg: init_dirs $(LIBDIR)/libogg.a + +$(LIBDIR)/libogg.a: $(DOWNLOADS)/ogg/Makefile + cd $(DOWNLOADS)/ogg; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/ogg/Makefile: $(DOWNLOADS)/ogg/configure + cd $(DOWNLOADS)/ogg; \ + $(CONFIGURE) --enable-static=true --enable-shared=false + +$(DOWNLOADS)/ogg/configure: $(DOWNLOADS)/ogg/autogen.sh + cd $(DOWNLOADS)/ogg; ./autogen.sh + +$(DOWNLOADS)/ogg/autogen.sh: + $(CLONE) $(GITHUB)/xiph/ogg $(DOWNLOADS)/ogg + +# sigc++-2 +sigcxx: init_dirs $(LIBDIR)/libsigc-2.0.a + +$(LIBDIR)/libsigc-2.0.a: $(DOWNLOADS)/sigcxx/Makefile + cd $(DOWNLOADS)/sigcxx; \ + make; make install + +$(DOWNLOADS)/sigcxx/Makefile: $(DOWNLOADS)/sigcxx/autogen.sh + cd $(DOWNLOADS)/sigcxx; \ + $(AUTOGEN) --enable-static=yes --enable-shared=no + +$(DOWNLOADS)/sigcxx/autogen.sh: + $(CLONE) $(GITHUB)/libsigcplusplus/libsigcplusplus -b libsigc++-2-10 $(DOWNLOADS)/sigcxx + +# Pixman +pixman: init_dirs libpng $(LIBDIR)/libpixman-1.a + +$(LIBDIR)/libpixman-1.a: $(DOWNLOADS)/pixman/Makefile + cd $(DOWNLOADS)/pixman + make -C $(DOWNLOADS)/pixman -j$(NPROC) + make -C $(DOWNLOADS)/pixman install + +$(DOWNLOADS)/pixman/Makefile: $(DOWNLOADS)/pixman/autogen.sh + cd $(DOWNLOADS)/pixman; \ + $(AUTOGEN) --enable-static=yes --enable-shared=no + +$(DOWNLOADS)/pixman/autogen.sh: + $(CLONE) $(GITLAB)/mkxp-z/pixman $(DOWNLOADS)/pixman + + +# PhysFS + +physfs: init_dirs $(LIBDIR)/libphysfs.a + +$(LIBDIR)/libphysfs.a: $(DOWNLOADS)/physfs/cmakebuild/Makefile + cd $(DOWNLOADS)/physfs/cmakebuild; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/physfs/cmakebuild/Makefile: $(DOWNLOADS)/physfs/CMakeLists.txt + cd $(DOWNLOADS)/physfs; \ + mkdir cmakebuild; cd cmakebuild; \ + $(CMAKE) -DPHYSFS_BUILD_STATIC=true -DPHYSFS_BUILD_SHARED=false + +$(DOWNLOADS)/physfs/CMakeLists.txt: + $(CLONE) $(GITHUB)/criptych/physfs $(DOWNLOADS)/physfs + +# libpng +libpng: init_dirs $(LIBDIR)/libpng.a + +$(LIBDIR)/libpng.a: $(DOWNLOADS)/libpng/Makefile + cd $(DOWNLOADS)/libpng; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/libpng/Makefile: $(DOWNLOADS)/libpng/configure + cd $(DOWNLOADS)/libpng; \ + $(CONFIGURE) \ + --enable-shared=no --enable-static=yes + +$(DOWNLOADS)/libpng/configure: + $(CLONE) $(GITHUB)/glennrp/libpng $(DOWNLOADS)/libpng + +# libjpeg +libjpeg: init_dirs $(LIBDIR)/libjpeg.a + +$(LIBDIR)/libjpeg.a: $(DOWNLOADS)/libjpeg/cmakebuild/Makefile + cd $(DOWNLOADS)/libjpeg/cmakebuild; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/libjpeg/cmakebuild/Makefile: $(DOWNLOADS)/libjpeg/CMakeLists.txt + cd $(DOWNLOADS)/libjpeg; mkdir -p cmakebuild; cd cmakebuild; \ + $(CMAKE) -DENABLE_SHARED=no -DENABLE_STATIC=yes + +$(DOWNLOADS)/libjpeg/CMakeLists.txt: + $(CLONE) $(GITHUB)/libjpeg-turbo/libjpeg-turbo $(DOWNLOADS)/libjpeg + +# SDL2 +sdl2: init_dirs $(LIBDIR)/libSDL2.a + +$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/Makefile + cd $(DOWNLOADS)/sdl2; \ + make -j$(NPROC); make install; + +$(DOWNLOADS)/sdl2/Makefile: $(DOWNLOADS)/sdl2/configure + cd $(DOWNLOADS)/sdl2; \ + $(CONFIGURE) --enable-static=true --enable-shared=false $(SDL_FLAGS) + +$(DOWNLOADS)/sdl2/configure: $(DOWNLOADS)/sdl2/autogen.sh + cd $(DOWNLOADS)/sdl2; ./autogen.sh + +$(DOWNLOADS)/sdl2/autogen.sh: + $(CLONE) $(GITHUB)/SDL-mirror/SDL $(DOWNLOADS)/sdl2 + +# SDL2 (Image) +sdl2image: init_dirs sdl2 libpng libjpeg $(LIBDIR)/libSDL2_image.a + +$(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/Makefile + cd $(DOWNLOADS)/sdl2_image; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure + cd $(DOWNLOADS)/sdl2_image; \ + LIBPNG_LIBS=$(LIBDIR)/libpng.a \ + $(CONFIGURE) --enable-static=true --enable-shared=false \ + --disable-imageio \ + --enable-png=yes --enable-png-shared=no \ + --enable-jpeg=yes --enable-jpeg-shared=no \ + --enable-webp=no + +$(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh + cd $(DOWNLOADS)/sdl2_image; ./autogen.sh + +$(DOWNLOADS)/sdl2_image/autogen.sh: + $(CLONE) $(GITHUB)/SDL-mirror/SDL_image $(DOWNLOADS)/sdl2_image + +# SDL2 (ttf) +sdl2ttf: init_dirs sdl2 freetype $(LIBDIR)/libSDL2_ttf.a + +$(LIBDIR)/libSDL2_ttf.a: $(DOWNLOADS)/sdl2_ttf/Makefile + cd $(DOWNLOADS)/sdl2_ttf; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/sdl2_ttf/Makefile: $(DOWNLOADS)/sdl2_ttf/configure + cd $(DOWNLOADS)/sdl2_ttf; \ + $(CONFIGURE) --enable-static=true --enable-shared=false + +$(DOWNLOADS)/sdl2_ttf/configure: $(DOWNLOADS)/sdl2_ttf/autogen.sh + cd $(DOWNLOADS)/sdl2_ttf; ./autogen.sh + +$(DOWNLOADS)/sdl2_ttf/autogen.sh: + $(CLONE) $(GITHUB)/SDL-mirror/SDL_ttf $(DOWNLOADS)/sdl2_ttf + +# Freetype (dependency of SDL2_ttf) +freetype: init_dirs $(LIBDIR)/libfreetype.a + +$(LIBDIR)/libfreetype.a: $(DOWNLOADS)/freetype/Makefile + cd $(DOWNLOADS)/freetype; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/freetype/Makefile: $(DOWNLOADS)/freetype/configure + cd $(DOWNLOADS)/freetype; \ + $(CONFIGURE) --enable-static=true --enable-shared=false + +$(DOWNLOADS)/freetype/configure: $(DOWNLOADS)/freetype/autogen.sh + cd $(DOWNLOADS)/freetype; ./autogen.sh + +$(DOWNLOADS)/freetype/autogen.sh: + $(CLONE) $(GITHUB)/aseprite/freetype2 $(DOWNLOADS)/freetype + +# ObjFW +objfw: init_dirs $(LIBDIR)/libobjfw.a + +$(LIBDIR)/libobjfw.a: $(DOWNLOADS)/ObjFW/Makefile + cd $(DOWNLOADS)/ObjFW; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/ObjFW/Makefile: $(DOWNLOADS)/ObjFW/configure + cd $(DOWNLOADS)/ObjFW; \ + $(CONFIGURE) --enable-static --disable-shared + +$(DOWNLOADS)/ObjFW/configure: $(DOWNLOADS)/ObjFW/autogen.sh + cd $(DOWNLOADS)/ObjFW; \ + ./autogen.sh + +$(DOWNLOADS)/ObjFW/autogen.sh: + $(CLONE) $(GITHUB)/ObjFW/ObjFW $(DOWNLOADS)/ObjFW; \ + cd $(DOWNLOADS)/ObjFW; \ + git checkout 7ff624a09675925f08222499249ef25f325bee41 + +# Standard ruby +ruby: init_dirs $(LIBDIR)/libruby*.a + +$(LIBDIR)/libruby*.a: $(DOWNLOADS)/ruby/Makefile + cd $(DOWNLOADS)/ruby; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/ruby/Makefile: $(DOWNLOADS)/ruby/configure + cd $(DOWNLOADS)/ruby; \ + $(CONFIGURE) $(RUBY_CONFIGURE_ARGS) + +$(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/*.c + cd $(DOWNLOADS)/ruby; autoconf + +$(DOWNLOADS)/ruby/*.c: + $(CLONE) $(GITHUB)/ruby/ruby --single-branch --branch ruby_2_6 $(DOWNLOADS)/ruby + +# Build your own ruby! +RUBY_PATH := ${RUBY_PATH} +custom-ruby: custom-ruby-makefile + cd $(RUBY_PATH); \ + make -j$(NPROC); make install + +custom-ruby-makefile: custom-ruby-configure + cd $(RUBY_PATH); $(CONFIGURE) ${RUBY_ARGS} + +custom-ruby-configure: $(RUBY_PATH)/*.c + cd $(RUBY_PATH); autoconf + + +# ==== +init_dirs: + mkdir -p $(LIBDIR) $(INCLUDEDIR) + +clean: clean-compiled + +powerwash: clean-compiled clean-downloads + +clean-downloads: + rm -rf downloads/ + +clean-compiled: + rm -rf build-*/ + +deps-core: libvorbis sigcxx pixman libpng libjpeg objfw physfs sdl2 sdl2image sdl2ttf +deps-binding: ruby +everything: deps-core deps-binding \ No newline at end of file diff --git a/macos/Deps.make b/macos/Deps.make deleted file mode 100644 index db79f38f..00000000 --- a/macos/Deps.make +++ /dev/null @@ -1,23 +0,0 @@ -GOODLS_URL := https://github.com/tanaikech/goodls/releases/download/v1.2.7/goodls_darwin_amd64 -DMG_URL := https://drive.google.com/file/d/1-9Pt5bxvFUuO_yPFzC_h3WvQ9LDA6Q5K/view?usp=sharing -DMG_NAME := Dependencies -GOODLS := gls - -DEP_FOLDER := MKXPZ-Dependencies - -deps: $(DMG_NAME).dmg - hdiutil attach "$(DMG_NAME).dmg" -mountroot . -quiet - -$(DMG_NAME).dmg: $(GOODLS) - "./$(GOODLS)" -u "$(DMG_URL)" -f "$(DMG_NAME).dmg" - -$(GOODLS): - curl -L "$(GOODLS_URL)" > "$(GOODLS)" - chmod +x "$(GOODLS)" - -unmount: - -hdiutil detach $(DEP_FOLDER) -quiet - -clean: unmount - rm -rf "$(GOODLS)" "$(DMG_NAME).dmg" - diff --git a/macos/README.md b/macos/README.md new file mode 100644 index 00000000..f8829bd4 --- /dev/null +++ b/macos/README.md @@ -0,0 +1,30 @@ +This folder contains an experimental Xcode project that will build mkxp-z and all of its dependencies. + +To get all dependencies, run: + +```sh +# From the project's root; +# This will download all the required tools +# for building the dependencies +cd macos/Dependencies +brew bundle install + +# Intel Macs +make -f .Intel everything + +# Apple Silicon Macs +make -f .AppleSilicon everything + +# Make individual targets +make -f .Intel ruby sdl2 objfw + +# Use your own Ruby, and build everything else (for Intel Macs) +make -f .Intel configure-ruby RUBY_PATH="Path to Ruby" RUBY_ARGS="extra configure arguments" +make -f .Intel deps-core +``` + +Afterwards, simply open the Xcode project and hit Command+B. + +If you built a version of ruby >= 2, change the MRI_VERSION build setting to match. + +If you built 1.8 or 1.9, you will probably need to redefine the header+library search paths. \ No newline at end of file diff --git a/macos/mkxp-z.xcodeproj/project.pbxproj b/macos/mkxp-z.xcodeproj/project.pbxproj index 755b0a1b..376c3ca3 100644 --- a/macos/mkxp-z.xcodeproj/project.pbxproj +++ b/macos/mkxp-z.xcodeproj/project.pbxproj @@ -7,25 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 3BA08E5825661C4700449CFF /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E5225661C4600449CFF /* Vorbis.framework */; }; - 3BA08E5925661C4700449CFF /* Vorbis.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E5225661C4600449CFF /* Vorbis.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 3BA08E5A25661C4700449CFF /* SDL2_ttf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E5325661C4700449CFF /* SDL2_ttf.framework */; }; - 3BA08E5B25661C4700449CFF /* SDL2_ttf.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E5325661C4700449CFF /* SDL2_ttf.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 3BA08E5E25661C4800449CFF /* Ogg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E5525661C4700449CFF /* Ogg.framework */; }; - 3BA08E5F25661C4800449CFF /* Ogg.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E5525661C4700449CFF /* Ogg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 3BA08E6025661C4800449CFF /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E5625661C4700449CFF /* SDL2.framework */; }; - 3BA08E6125661C4800449CFF /* SDL2.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E5625661C4700449CFF /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 3BA08E6225661C4800449CFF /* SDL2_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E5725661C4700449CFF /* SDL2_image.framework */; }; - 3BA08E6325661C4800449CFF /* SDL2_image.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E5725661C4700449CFF /* SDL2_image.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 3BA08E6525661CA600449CFF /* libfluidsynth.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E6425661CA600449CFF /* libfluidsynth.3.dylib */; }; - 3BA08E6725661CAA00449CFF /* libfluidsynth.3.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E6425661CA600449CFF /* libfluidsynth.3.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 3BA08E7025661CDA00449CFF /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E6925661CD900449CFF /* libphysfs.a */; }; - 3BA08E7225661CDA00449CFF /* libobjfwbridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E6A25661CD900449CFF /* libobjfwbridge.a */; }; - 3BA08E7425661CDA00449CFF /* libobjfw.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E6B25661CD900449CFF /* libobjfw.a */; }; - 3BA08E7625661CDA00449CFF /* libsigc-2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E6C25661CD900449CFF /* libsigc-2.0.a */; }; - 3BA08E7825661CDA00449CFF /* libpixman-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E6D25661CD900449CFF /* libpixman-1.a */; }; - 3BA08E7E25661D3700449CFF /* libruby.2.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E7D25661D3700449CFF /* libruby.2.7.dylib */; }; - 3BA08E7F25661D5600449CFF /* libruby.2.7.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08E7D25661D3700449CFF /* libruby.2.7.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 3BA08E9B256638C900449CFF /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46925651C1B003DAD8A /* AudioToolbox.framework */; }; 3BA08EAD256642A300449CFF /* bitmapBlit.frag in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BD2B4BB25654AD7003DAD8A /* bitmapBlit.frag */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 3BA08EAE256642A300449CFF /* blur.frag in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BD2B4AC25654AD6003DAD8A /* blur.frag */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; @@ -208,6 +189,32 @@ 3BD2B6F12565AEC0003DAD8A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46725651C00003DAD8A /* Foundation.framework */; }; 3BD2B6F32565AEC0003DAD8A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46525651BF3003DAD8A /* libz.tbd */; }; 3BD2B6F92565AEC0003DAD8A /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3BDB23E22564546E00C4A63D /* icon.icns */; }; + 3BE08102256879FE0006849F /* libSDL2main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080E4256879FC0006849F /* libSDL2main.a */; }; + 3BE08104256879FE0006849F /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080E6256879FC0006849F /* libvorbis.a */; }; + 3BE08105256879FE0006849F /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080E7256879FC0006849F /* libvorbisfile.a */; }; + 3BE08107256879FE0006849F /* libpixman-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080E9256879FC0006849F /* libpixman-1.a */; }; + 3BE08109256879FE0006849F /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080EB256879FC0006849F /* libSDL2.a */; }; + 3BE0810B256879FE0006849F /* libobjfwbridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080ED256879FD0006849F /* libobjfwbridge.a */; }; + 3BE0810D256879FE0006849F /* libSDL2_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080EF256879FD0006849F /* libSDL2_ttf.a */; }; + 3BE0810E256879FE0006849F /* libSDL2_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080F0256879FD0006849F /* libSDL2_image.a */; }; + 3BE08110256879FE0006849F /* libobjfw.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080F2256879FD0006849F /* libobjfw.a */; }; + 3BE08112256879FE0006849F /* libruby.2.6-static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080F4256879FD0006849F /* libruby.2.6-static.a */; }; + 3BE08118256879FE0006849F /* libSDL2_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FA256879FE0006849F /* libSDL2_test.a */; }; + 3BE08119256879FE0006849F /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FB256879FE0006849F /* libvorbisenc.a */; }; + 3BE0811A256879FE0006849F /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FC256879FE0006849F /* libfreetype.a */; }; + 3BE0811B256879FE0006849F /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FD256879FE0006849F /* libogg.a */; }; + 3BE0811D256879FE0006849F /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FF256879FE0006849F /* libphysfs.a */; }; + 3BE0811E256879FE0006849F /* libsigc-2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE08100256879FE0006849F /* libsigc-2.0.a */; }; + 3BE0812525687EFF0006849F /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE0812425687EFF0006849F /* CoreAudio.framework */; }; + 3BE0812725687F070006849F /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE0812625687F070006849F /* libbz2.tbd */; }; + 3BE0812A25687F130006849F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE0812925687F130006849F /* CoreGraphics.framework */; }; + 3BE0812D25687F390006849F /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE0812C25687F390006849F /* CoreVideo.framework */; }; + 3BE0812F25687F4F0006849F /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE0812E25687F4F0006849F /* ForceFeedback.framework */; }; + 3BE0813125687F640006849F /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE0813025687F640006849F /* Metal.framework */; }; + 3BE0813325687F700006849F /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE0813225687F700006849F /* AppKit.framework */; }; + 3BE0813625687FA30006849F /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE0813525687FA30006849F /* Carbon.framework */; }; + 3BE081462568A5C60006849F /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081452568A5C60006849F /* libpng.a */; }; + 3BE0814A2568A5F60006849F /* libturbojpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081492568A5F60006849F /* libturbojpeg.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -218,97 +225,6 @@ remoteGlobalIDString = 3BA08EA3256641ED00449CFF; remoteInfo = "mkxpz-resources"; }; - 3BA08F5E25673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = BECDF66C0761BA81005FE872; - remoteInfo = Framework; - }; - 3BA08F6025673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A7D88B5423E2437C00DCD162; - remoteInfo = "Framework-iOS"; - }; - 3BA08F6225673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A7D88D1523E24BED00DCD162; - remoteInfo = "Framework-tvOS"; - }; - 3BA08F6425673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = BECDF6B30761BA81005FE872; - remoteInfo = "Static Library"; - }; - 3BA08F6625673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A7D88E5423E24D3B00DCD162; - remoteInfo = "Static Library-iOS"; - }; - 3BA08F6825673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A769B23D23E259AE00872273; - remoteInfo = "Static Library-tvOS"; - }; - 3BA08F6A25673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = DB31407717554B71006C0E22; - remoteInfo = "Shared Library"; - }; - 3BA08F6C25673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A75FCEB323E25AB700529352; - remoteInfo = "Shared Library-iOS"; - }; - 3BA08F6E25673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A75FD06C23E25AC700529352; - remoteInfo = "Shared Library-tvOS"; - }; - 3BA08F7025673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = BECDF6BE0761BA81005FE872; - remoteInfo = "Standard DMG"; - }; - 3BA08F7225673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A75FDB8C23E4C74400529352; - remoteInfo = hidapi; - }; - 3BA08F7425673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A75FDB4923E399AC00529352; - remoteInfo = "hidapi-iOS"; - }; - 3BA08F7625673BA600449CFF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A75FDB6E23E3A2C900529352; - remoteInfo = "hidapi-tvOS"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -367,38 +283,9 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3BD2B6FA2565AEC0003DAD8A /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 3BA08E6125661C4800449CFF /* SDL2.framework in Embed Frameworks */, - 3BA08E7F25661D5600449CFF /* libruby.2.7.dylib in Embed Frameworks */, - 3BA08E5B25661C4700449CFF /* SDL2_ttf.framework in Embed Frameworks */, - 3BA08E6325661C4800449CFF /* SDL2_image.framework in Embed Frameworks */, - 3BA08E6725661CAA00449CFF /* libfluidsynth.3.dylib in Embed Frameworks */, - 3BA08E5F25661C4800449CFF /* Ogg.framework in Embed Frameworks */, - 3BA08E5925661C4700449CFF /* Vorbis.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 3BA08E5225661C4600449CFF /* Vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Vorbis.framework; path = "MKXPZ-Dependencies/mac/frameworks/Vorbis.framework"; sourceTree = ""; }; - 3BA08E5325661C4700449CFF /* SDL2_ttf.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_ttf.framework; path = "MKXPZ-Dependencies/mac/frameworks/SDL2_ttf.framework"; sourceTree = ""; }; - 3BA08E5525661C4700449CFF /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = "MKXPZ-Dependencies/mac/frameworks/Ogg.framework"; sourceTree = ""; }; - 3BA08E5625661C4700449CFF /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = "MKXPZ-Dependencies/mac/frameworks/SDL2.framework"; sourceTree = ""; }; - 3BA08E5725661C4700449CFF /* SDL2_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_image.framework; path = "MKXPZ-Dependencies/mac/frameworks/SDL2_image.framework"; sourceTree = ""; }; - 3BA08E6425661CA600449CFF /* libfluidsynth.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfluidsynth.3.dylib; path = "MKXPZ-Dependencies/mac/prefix/lib64/libfluidsynth.3.dylib"; sourceTree = ""; }; - 3BA08E6925661CD900449CFF /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = "MKXPZ-Dependencies/mac/prefix/lib/libphysfs.a"; sourceTree = ""; }; - 3BA08E6A25661CD900449CFF /* libobjfwbridge.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfwbridge.a; path = "MKXPZ-Dependencies/mac/prefix/lib/libobjfwbridge.a"; sourceTree = ""; }; - 3BA08E6B25661CD900449CFF /* libobjfw.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw.a; path = "MKXPZ-Dependencies/mac/prefix/lib/libobjfw.a"; sourceTree = ""; }; - 3BA08E6C25661CD900449CFF /* libsigc-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsigc-2.0.a"; path = "MKXPZ-Dependencies/mac/prefix/lib/libsigc-2.0.a"; sourceTree = ""; }; - 3BA08E6D25661CD900449CFF /* libpixman-1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpixman-1.a"; path = "MKXPZ-Dependencies/mac/prefix/lib/libpixman-1.a"; sourceTree = ""; }; - 3BA08E7D25661D3700449CFF /* libruby.2.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libruby.2.7.dylib; path = "MKXPZ-Dependencies/mac/prefix/opt/ruby2.7.0/lib/libruby.2.7.dylib"; sourceTree = ""; }; 3BA08EA4256641ED00449CFF /* Assets.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Assets.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 3BA08EA6256641EE00449CFF /* Assets.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Assets.plist; sourceTree = ""; }; 3BA08EE725664BCC00449CFF /* SDL_sound_shn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sound_shn.c; sourceTree = ""; }; @@ -419,7 +306,6 @@ 3BA08EF625664BCC00449CFF /* SDL_sound_aiff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sound_aiff.c; sourceTree = ""; }; 3BA08EF725664BCC00449CFF /* SDL_sound_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sound_flac.c; sourceTree = ""; }; 3BA08EF825664BCC00449CFF /* stb_vorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stb_vorbis.h; sourceTree = ""; }; - 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../../../Users/zoroark/SDL-mirror/Xcode/SDL/SDL.xcodeproj"; sourceTree = ""; }; 3BA08FA425674C9400449CFF /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 3BD2B3AF25651885003DAD8A /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = ""; }; 3BD2B46525651BF3003DAD8A /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; @@ -596,6 +482,34 @@ 3BDB23E22564546E00C4A63D /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = ""; }; 3BDB240A2564715C00C4A63D /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = ""; }; 3BDB25C52565184600C4A63D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3BE080E4256879FC0006849F /* libSDL2main.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2main.a; path = "Dependencies/build-x86_64/lib/libSDL2main.a"; sourceTree = ""; }; + 3BE080E6256879FC0006849F /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "Dependencies/build-x86_64/lib/libvorbis.a"; sourceTree = ""; }; + 3BE080E7256879FC0006849F /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = "Dependencies/build-x86_64/lib/libvorbisfile.a"; sourceTree = ""; }; + 3BE080E9256879FC0006849F /* libpixman-1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpixman-1.a"; path = "Dependencies/build-x86_64/lib/libpixman-1.a"; sourceTree = ""; }; + 3BE080EB256879FC0006849F /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = "Dependencies/build-x86_64/lib/libSDL2.a"; sourceTree = ""; }; + 3BE080ED256879FD0006849F /* libobjfwbridge.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfwbridge.a; path = "Dependencies/build-x86_64/lib/libobjfwbridge.a"; sourceTree = ""; }; + 3BE080EF256879FD0006849F /* libSDL2_ttf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_ttf.a; path = "Dependencies/build-x86_64/lib/libSDL2_ttf.a"; sourceTree = ""; }; + 3BE080F0256879FD0006849F /* libSDL2_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_image.a; path = "Dependencies/build-x86_64/lib/libSDL2_image.a"; sourceTree = ""; }; + 3BE080F2256879FD0006849F /* libobjfw.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw.a; path = "Dependencies/build-x86_64/lib/libobjfw.a"; sourceTree = ""; }; + 3BE080F4256879FD0006849F /* libruby.2.6-static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libruby.2.6-static.a"; path = "Dependencies/build-x86_64/lib/libruby.2.6-static.a"; sourceTree = ""; }; + 3BE080FA256879FE0006849F /* libSDL2_test.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_test.a; path = "Dependencies/build-x86_64/lib/libSDL2_test.a"; sourceTree = ""; }; + 3BE080FB256879FE0006849F /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = "Dependencies/build-x86_64/lib/libvorbisenc.a"; sourceTree = ""; }; + 3BE080FC256879FE0006849F /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "Dependencies/build-x86_64/lib/libfreetype.a"; sourceTree = ""; }; + 3BE080FD256879FE0006849F /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "Dependencies/build-x86_64/lib/libogg.a"; sourceTree = ""; }; + 3BE080FF256879FE0006849F /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = "Dependencies/build-x86_64/lib/libphysfs.a"; sourceTree = ""; }; + 3BE08100256879FE0006849F /* libsigc-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsigc-2.0.a"; path = "Dependencies/build-x86_64/lib/libsigc-2.0.a"; sourceTree = ""; }; + 3BE0812425687EFF0006849F /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; + 3BE0812625687F070006849F /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; }; + 3BE0812925687F130006849F /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 3BE0812C25687F390006849F /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; + 3BE0812E25687F4F0006849F /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = System/Library/Frameworks/ForceFeedback.framework; sourceTree = SDKROOT; }; + 3BE0813025687F640006849F /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; }; + 3BE0813225687F700006849F /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + 3BE0813525687FA30006849F /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; + 3BE0813F25689EAC0006849F /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; + 3BE0814025689EB70006849F /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; + 3BE081452568A5C60006849F /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "Dependencies/build-x86_64/lib/libpng.a"; sourceTree = ""; }; + 3BE081492568A5F60006849F /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = "Dependencies/build-x86_64/lib/libturbojpeg.a"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -610,40 +524,46 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3BE0813625687FA30006849F /* Carbon.framework in Frameworks */, + 3BE0813325687F700006849F /* AppKit.framework in Frameworks */, + 3BE0813125687F640006849F /* Metal.framework in Frameworks */, + 3BE0812D25687F390006849F /* CoreVideo.framework in Frameworks */, + 3BE0812F25687F4F0006849F /* ForceFeedback.framework in Frameworks */, + 3BE0812A25687F130006849F /* CoreGraphics.framework in Frameworks */, + 3BE0812725687F070006849F /* libbz2.tbd in Frameworks */, + 3BE0812525687EFF0006849F /* CoreAudio.framework in Frameworks */, 3BD2B6E72565AEC0003DAD8A /* IOKit.framework in Frameworks */, - 3BA08E5825661C4700449CFF /* Vorbis.framework in Frameworks */, - 3BA08E6025661C4800449CFF /* SDL2.framework in Frameworks */, + 3BE08112256879FE0006849F /* libruby.2.6-static.a in Frameworks */, 3BD2B6ED2565AEC0003DAD8A /* libiconv.tbd in Frameworks */, + 3BE0810D256879FE0006849F /* libSDL2_ttf.a in Frameworks */, 3BD2B6EE2565AEC0003DAD8A /* OpenAL.framework in Frameworks */, - 3BA08E5E25661C4800449CFF /* Ogg.framework in Frameworks */, - 3BA08E5A25661C4700449CFF /* SDL2_ttf.framework in Frameworks */, - 3BA08E6225661C4800449CFF /* SDL2_image.framework in Frameworks */, + 3BE08119256879FE0006849F /* libvorbisenc.a in Frameworks */, 3BD2B6EF2565AEC0003DAD8A /* CoreFoundation.framework in Frameworks */, 3BD2B6F12565AEC0003DAD8A /* Foundation.framework in Frameworks */, + 3BE08102256879FE0006849F /* libSDL2main.a in Frameworks */, + 3BE08107256879FE0006849F /* libpixman-1.a in Frameworks */, + 3BE0811B256879FE0006849F /* libogg.a in Frameworks */, + 3BE08109256879FE0006849F /* libSDL2.a in Frameworks */, + 3BE0814A2568A5F60006849F /* libturbojpeg.a in Frameworks */, + 3BE081462568A5C60006849F /* libpng.a in Frameworks */, + 3BE08104256879FE0006849F /* libvorbis.a in Frameworks */, 3BA08E9B256638C900449CFF /* AudioToolbox.framework in Frameworks */, - 3BA08E6525661CA600449CFF /* libfluidsynth.3.dylib in Frameworks */, + 3BE0811E256879FE0006849F /* libsigc-2.0.a in Frameworks */, + 3BE08118256879FE0006849F /* libSDL2_test.a in Frameworks */, + 3BE08105256879FE0006849F /* libvorbisfile.a in Frameworks */, + 3BE0810E256879FE0006849F /* libSDL2_image.a in Frameworks */, + 3BE0811A256879FE0006849F /* libfreetype.a in Frameworks */, + 3BE0810B256879FE0006849F /* libobjfwbridge.a in Frameworks */, 3BD2B6F32565AEC0003DAD8A /* libz.tbd in Frameworks */, - 3BA08E7625661CDA00449CFF /* libsigc-2.0.a in Frameworks */, - 3BA08E7425661CDA00449CFF /* libobjfw.a in Frameworks */, 3BA08FA525674C9900449CFF /* OpenGL.framework in Frameworks */, - 3BA08E7225661CDA00449CFF /* libobjfwbridge.a in Frameworks */, - 3BA08E7025661CDA00449CFF /* libphysfs.a in Frameworks */, - 3BA08E7E25661D3700449CFF /* libruby.2.7.dylib in Frameworks */, - 3BA08E7825661CDA00449CFF /* libpixman-1.a in Frameworks */, + 3BE0811D256879FE0006849F /* libphysfs.a in Frameworks */, + 3BE08110256879FE0006849F /* libobjfw.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 3BA08E7A25661D0E00449CFF /* Ruby */ = { - isa = PBXGroup; - children = ( - 3BA08E7D25661D3700449CFF /* libruby.2.7.dylib */, - ); - name = Ruby; - sourceTree = ""; - }; 3BA08EA5256641ED00449CFF /* misc */ = { isa = PBXGroup; children = ( @@ -678,26 +598,6 @@ path = ../SDL2_sound; sourceTree = ""; }; - 3BA08F4F25673BA600449CFF /* Products */ = { - isa = PBXGroup; - children = ( - 3BA08F5F25673BA600449CFF /* SDL2.framework */, - 3BA08F6125673BA600449CFF /* SDL2.framework */, - 3BA08F6325673BA600449CFF /* SDL2.framework */, - 3BA08F6525673BA600449CFF /* libSDL2.a */, - 3BA08F6725673BA600449CFF /* libSDL2.a */, - 3BA08F6925673BA600449CFF /* libSDL2.a */, - 3BA08F6B25673BA600449CFF /* libSDL2.dylib */, - 3BA08F6D25673BA600449CFF /* libSDL2.dylib */, - 3BA08F6F25673BA600449CFF /* libSDL2.dylib */, - 3BA08F7125673BA600449CFF /* SDL2 */, - 3BA08F7325673BA600449CFF /* hidapi.framework */, - 3BA08F7525673BA600449CFF /* hidapi.framework */, - 3BA08F7725673BA600449CFF /* hidapi.framework */, - ); - name = Products; - sourceTree = ""; - }; 3BD2B3B2256518A1003DAD8A /* Configuration */ = { isa = PBXGroup; children = ( @@ -776,7 +676,6 @@ 3BDB22EB25644FBF00C4A63D = { isa = PBXGroup; children = ( - 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */, 3BD2B7272565B343003DAD8A /* README.md */, 3BDB2409256470AE00C4A63D /* Player */, 3BA08EA5256641ED00449CFF /* misc */, @@ -955,19 +854,17 @@ 3BDB23E5256455A400C4A63D /* Frameworks */ = { isa = PBXGroup; children = ( - 3BA08E7A25661D0E00449CFF /* Ruby */, + 3BE0813525687FA30006849F /* Carbon.framework */, + 3BE0813225687F700006849F /* AppKit.framework */, + 3BE0813025687F640006849F /* Metal.framework */, + 3BE0812E25687F4F0006849F /* ForceFeedback.framework */, + 3BE0812C25687F390006849F /* CoreVideo.framework */, + 3BE0814025689EB70006849F /* Carbon.framework */, + 3BE0812925687F130006849F /* CoreGraphics.framework */, + 3BE0812625687F070006849F /* libbz2.tbd */, + 3BE0812425687EFF0006849F /* CoreAudio.framework */, + 3BE080CA256829FE0006849F /* Temp-IntelOnly */, 3BD2B46425651BEB003DAD8A /* System */, - 3BA08E5525661C4700449CFF /* Ogg.framework */, - 3BA08E5725661C4700449CFF /* SDL2_image.framework */, - 3BA08E5325661C4700449CFF /* SDL2_ttf.framework */, - 3BA08E5625661C4700449CFF /* SDL2.framework */, - 3BA08E5225661C4600449CFF /* Vorbis.framework */, - 3BA08E6425661CA600449CFF /* libfluidsynth.3.dylib */, - 3BA08E6B25661CD900449CFF /* libobjfw.a */, - 3BA08E6A25661CD900449CFF /* libobjfwbridge.a */, - 3BA08E6925661CD900449CFF /* libphysfs.a */, - 3BA08E6D25661CD900449CFF /* libpixman-1.a */, - 3BA08E6C25661CD900449CFF /* libsigc-2.0.a */, ); name = Frameworks; sourceTree = ""; @@ -984,37 +881,49 @@ name = Player; sourceTree = ""; }; + 3BE080CA256829FE0006849F /* Temp-IntelOnly */ = { + isa = PBXGroup; + children = ( + 3BE080FC256879FE0006849F /* libfreetype.a */, + 3BE080F2256879FD0006849F /* libobjfw.a */, + 3BE080ED256879FD0006849F /* libobjfwbridge.a */, + 3BE0813F25689EAC0006849F /* Carbon.framework */, + 3BE080FD256879FE0006849F /* libogg.a */, + 3BE081452568A5C60006849F /* libpng.a */, + 3BE081492568A5F60006849F /* libturbojpeg.a */, + 3BE080FF256879FE0006849F /* libphysfs.a */, + 3BE080E9256879FC0006849F /* libpixman-1.a */, + 3BE080F4256879FD0006849F /* libruby.2.6-static.a */, + 3BE080F0256879FD0006849F /* libSDL2_image.a */, + 3BE080FA256879FE0006849F /* libSDL2_test.a */, + 3BE080EF256879FD0006849F /* libSDL2_ttf.a */, + 3BE080EB256879FC0006849F /* libSDL2.a */, + 3BE080E4256879FC0006849F /* libSDL2main.a */, + 3BE08100256879FE0006849F /* libsigc-2.0.a */, + 3BE080E6256879FC0006849F /* libvorbis.a */, + 3BE080FB256879FE0006849F /* libvorbisenc.a */, + 3BE080E7256879FC0006849F /* libvorbisfile.a */, + ); + name = "Temp-IntelOnly"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ 3BA08E902566314300449CFF /* Obtain Dependencies */ = { isa = PBXLegacyTarget; - buildArgumentsString = "-f Deps.make $(ACTION)"; + buildArgumentsString = "everything ruby -f .Intel"; buildConfigurationList = 3BA08E912566314300449CFF /* Build configuration list for PBXLegacyTarget "Obtain Dependencies" */; buildPhases = ( ); buildToolPath = /usr/bin/make; - buildWorkingDirectory = ""; + buildWorkingDirectory = "$(PROJECT_DIR)/Dependencies"; dependencies = ( ); name = "Obtain Dependencies"; passBuildSettingsInEnvironment = 1; productName = gen; }; - 3BA08E9C25663C2E00449CFF /* Remove Dependencies */ = { - isa = PBXLegacyTarget; - buildArgumentsString = "clean -f Deps.make"; - buildConfigurationList = 3BA08E9D25663C2E00449CFF /* Build configuration list for PBXLegacyTarget "Remove Dependencies" */; - buildPhases = ( - ); - buildToolPath = /usr/bin/make; - buildWorkingDirectory = ""; - dependencies = ( - ); - name = "Remove Dependencies"; - passBuildSettingsInEnvironment = 1; - productName = "Remove Dependencies"; - }; /* End PBXLegacyTarget section */ /* Begin PBXNativeTarget section */ @@ -1045,7 +954,6 @@ 3BD2B64C2565AEC0003DAD8A /* Sources */, 3BD2B6E12565AEC0003DAD8A /* Frameworks */, 3BD2B6F82565AEC0003DAD8A /* Resources */, - 3BD2B6FA2565AEC0003DAD8A /* Embed Frameworks */, ); buildRules = ( ); @@ -1068,9 +976,6 @@ 3BA08E902566314300449CFF = { CreatedOnToolsVersion = 12.2; }; - 3BA08E9C25663C2E00449CFF = { - CreatedOnToolsVersion = 12.2; - }; 3BA08EA3256641ED00449CFF = { CreatedOnToolsVersion = 12.2; }; @@ -1087,116 +992,15 @@ mainGroup = 3BDB22EB25644FBF00C4A63D; productRefGroup = 3BDB22F72564501400C4A63D /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 3BA08F4F25673BA600449CFF /* Products */; - ProjectRef = 3BA08F4E25673BA600449CFF /* SDL.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 3BA08EA3256641ED00449CFF /* Assets */, 3BA08E902566314300449CFF /* Obtain Dependencies */, 3BD2B64B2565AEC0003DAD8A /* Player */, - 3BA08E9C25663C2E00449CFF /* Remove Dependencies */, ); }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 3BA08F5F25673BA600449CFF /* SDL2.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = SDL2.framework; - remoteRef = 3BA08F5E25673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F6125673BA600449CFF /* SDL2.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = SDL2.framework; - remoteRef = 3BA08F6025673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F6325673BA600449CFF /* SDL2.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = SDL2.framework; - remoteRef = 3BA08F6225673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F6525673BA600449CFF /* libSDL2.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libSDL2.a; - remoteRef = 3BA08F6425673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F6725673BA600449CFF /* libSDL2.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libSDL2.a; - remoteRef = 3BA08F6625673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F6925673BA600449CFF /* libSDL2.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libSDL2.a; - remoteRef = 3BA08F6825673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F6B25673BA600449CFF /* libSDL2.dylib */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.dylib"; - path = libSDL2.dylib; - remoteRef = 3BA08F6A25673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F6D25673BA600449CFF /* libSDL2.dylib */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.dylib"; - path = libSDL2.dylib; - remoteRef = 3BA08F6C25673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F6F25673BA600449CFF /* libSDL2.dylib */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.dylib"; - path = libSDL2.dylib; - remoteRef = 3BA08F6E25673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F7125673BA600449CFF /* SDL2 */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = SDL2; - remoteRef = 3BA08F7025673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F7325673BA600449CFF /* hidapi.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = hidapi.framework; - remoteRef = 3BA08F7225673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F7525673BA600449CFF /* hidapi.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = hidapi.framework; - remoteRef = 3BA08F7425673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3BA08F7725673BA600449CFF /* hidapi.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = hidapi.framework; - remoteRef = 3BA08F7625673BA600449CFF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 3BA08EA2256641ED00449CFF /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -1502,122 +1306,6 @@ }; name = Release; }; - 3BA08E9E25663C2E00449CFF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - DEBUGGING_SYMBOLS = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 3BA08E9F25663C2E00449CFF /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; 3BA08EA7256641EE00449CFF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1801,10 +1489,7 @@ ENABLE_HARDENED_RUNTIME = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/MKXPZ-Dependencies/mac/frameworks", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_DYNAMIC_NO_PIC = NO; GCC_INPUT_FILETYPE = automatic; @@ -1819,8 +1504,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(RUBY_INSTALL_PREFIX)/include/ruby-$(MRI_VERSION)/x86_64-darwin17", - "$(RUBY_INSTALL_PREFIX)/include/ruby-$(MRI_VERSION)", + "\"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)\"", + "\"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/x86_64-darwin\"", ); INFOPLIST_FILE = Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1829,9 +1514,7 @@ ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/MKXPZ-Dependencies/mac/prefix/lib64", - "$(PROJECT_DIR)/MKXPZ-Dependencies/mac/prefix/lib", - "$(PROJECT_DIR)/MKXPZ-Dependencies/mac/prefix/opt/ruby2.7.0/lib", + "$(PROJECT_DIR)/Dependencies/build-x86_64/lib", ); MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 2.0; @@ -1899,10 +1582,7 @@ ENABLE_HARDENED_RUNTIME = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/MKXPZ-Dependencies/mac/frameworks", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_INPUT_FILETYPE = automatic; GCC_NO_COMMON_BLOCKS = YES; @@ -1915,8 +1595,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(RUBY_INSTALL_PREFIX)/include/ruby-$(MRI_VERSION)/x86_64-darwin17", - "$(RUBY_INSTALL_PREFIX)/include/ruby-$(MRI_VERSION)", + "\"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)\"", + "\"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/x86_64-darwin\"", ); INFOPLIST_FILE = Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1925,9 +1605,7 @@ ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/MKXPZ-Dependencies/mac/prefix/lib64", - "$(PROJECT_DIR)/MKXPZ-Dependencies/mac/prefix/lib", - "$(PROJECT_DIR)/MKXPZ-Dependencies/mac/prefix/opt/ruby2.7.0/lib", + "$(PROJECT_DIR)/Dependencies/build-x86_64/lib", ); MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 2.0; @@ -1951,7 +1629,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 3BDB240A2564715C00C4A63D /* Config.xcconfig */; buildSettings = { - ARCHS = x86_64; + ARCHS = "$(ARCHS_STANDARD)"; MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; }; @@ -1961,7 +1639,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 3BDB240A2564715C00C4A63D /* Config.xcconfig */; buildSettings = { - ARCHS = x86_64; + ARCHS = "$(ARCHS_STANDARD)"; MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; }; @@ -1979,15 +1657,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3BA08E9D25663C2E00449CFF /* Build configuration list for PBXLegacyTarget "Remove Dependencies" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3BA08E9E25663C2E00449CFF /* Debug */, - 3BA08E9F25663C2E00449CFF /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 3BA08EA9256641EE00449CFF /* Build configuration list for PBXNativeTarget "Assets" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/macos/mkxp-z.xcodeproj/project.xcworkspace/xcuserdata/zoroark.xcuserdatad/UserInterfaceState.xcuserstate b/macos/mkxp-z.xcodeproj/project.xcworkspace/xcuserdata/zoroark.xcuserdatad/UserInterfaceState.xcuserstate index e00c2c8f..f138b936 100644 Binary files a/macos/mkxp-z.xcodeproj/project.xcworkspace/xcuserdata/zoroark.xcuserdatad/UserInterfaceState.xcuserstate and b/macos/mkxp-z.xcodeproj/project.xcworkspace/xcuserdata/zoroark.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/macos/mkxp-z.xcodeproj/xcuserdata/zoroark.xcuserdatad/xcschemes/xcschememanagement.plist b/macos/mkxp-z.xcodeproj/xcuserdata/zoroark.xcuserdatad/xcschemes/xcschememanagement.plist index 52e811e1..228c9582 100644 --- a/macos/mkxp-z.xcodeproj/xcuserdata/zoroark.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/macos/mkxp-z.xcodeproj/xcuserdata/zoroark.xcuserdatad/xcschemes/xcschememanagement.plist @@ -10,6 +10,11 @@ 2 Obtain Dependencies.xcscheme_^#shared#^_ + + orderHint + 1 + + Player copy.xcscheme_^#shared#^_ orderHint 4 @@ -17,12 +22,12 @@ Player.xcscheme_^#shared#^_ orderHint - 1 + 0 Remove Dependencies.xcscheme_^#shared#^_ orderHint - 3 + 1 gen.xcscheme_^#shared#^_