diff --git a/macos/Dependencies/.AppleSilicon b/macos/Dependencies/.AppleSilicon index 8009bd3b..8b429f6f 100644 --- a/macos/Dependencies/.AppleSilicon +++ b/macos/Dependencies/.AppleSilicon @@ -3,4 +3,10 @@ ARCH := arm64 HOST := aarch64-apple-darwin MINIMUM_REQUIRED := 11.0 +SDL_FLAGS := ${SDL_FLAGS} +SDL2_IMAGE_FLAGS := ${SDL2_IMAGE_FLAGS} +SDL2_TTF_FLAGS := ${SDL2_TTF_FLAGS} +OPENAL_FLAGS := ${OPENAL_FLAGS} +RUBY_FLAGS := ${RUBY_FLAGS} + include dependencies.make diff --git a/macos/Dependencies/.Intel b/macos/Dependencies/.Intel index a095b8f5..5b6d5935 100644 --- a/macos/Dependencies/.Intel +++ b/macos/Dependencies/.Intel @@ -3,4 +3,12 @@ ARCH := x86_64 HOST := $(ARCH)-apple-darwin MINIMUM_REQUIRED := 10.12 +SDL_FLAGS := ${SDL_FLAGS} +SDL2_IMAGE_FLAGS := ${SDL2_IMAGE_FLAGS} +SDL2_TTF_FLAGS := ${SDL2_TTF_FLAGS} +OPENAL_FLAGS := ${OPENAL_FLAGS} +RUBY_FLAGS := ${RUBY_FLAGS} + + + include dependencies.make diff --git a/macos/Dependencies/.iOS b/macos/Dependencies/.iOS index ab86bf2d..1a55a259 100644 --- a/macos/Dependencies/.iOS +++ b/macos/Dependencies/.iOS @@ -3,4 +3,10 @@ ARCH := armv7 HOST := $(ARCH)-iphone-darwin MINIMUM_REQUIRED := 10.0 +SDL_FLAGS := ${SDL_FLAGS} +SDL2_IMAGE_FLAGS := ${SDL2_IMAGE_FLAGS} +SDL2_TTF_FLAGS := ${SDL2_TTF_FLAGS} +OPENAL_FLAGS := ${OPENAL_FLAGS} +RUBY_FLAGS := ${RUBY_FLAGS} + include dependencies.make diff --git a/macos/Dependencies/dependencies.make b/macos/Dependencies/dependencies.make index b5235567..a71c0c75 100644 --- a/macos/Dependencies/dependencies.make +++ b/macos/Dependencies/dependencies.make @@ -11,7 +11,7 @@ LDFLAGS := -L$(LIBDIR) CC := xcrun -sdk $(SDK) clang -arch $(ARCH) -isysroot $(SDKROOT) PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig GIT := git -CLONE := $(GIT) clone +CLONE := $(GIT) clone -q GITHUB := https://github.com GITLAB := https://gitlab.com @@ -62,7 +62,7 @@ $(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh ./autogen.sh $(DOWNLOADS)/vorbis/autogen.sh: - $(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis + $(CLONE) $(GITLAB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis # Ogg, dependency of Vorbis @@ -80,7 +80,7 @@ $(DOWNLOADS)/ogg/configure: $(DOWNLOADS)/ogg/autogen.sh cd $(DOWNLOADS)/ogg; ./autogen.sh $(DOWNLOADS)/ogg/autogen.sh: - $(CLONE) $(GITHUB)/xiph/ogg $(DOWNLOADS)/ogg + $(CLONE) $(GITLAB)/mkxp-z/ogg $(DOWNLOADS)/ogg # sigc++-2 sigcxx: init_dirs $(LIBDIR)/libsigc-2.0.a @@ -94,7 +94,7 @@ $(DOWNLOADS)/sigcxx/Makefile: $(DOWNLOADS)/sigcxx/autogen.sh $(AUTOGEN) --enable-static=yes --enable-shared=no $(DOWNLOADS)/sigcxx/autogen.sh: - $(CLONE) $(GITHUB)/libsigcplusplus/libsigcplusplus -b libsigc++-2-10 $(DOWNLOADS)/sigcxx + $(CLONE) $(GITLAB)/mkxp-z/libsigcplusplus $(DOWNLOADS)/sigcxx # Pixman pixman: init_dirs libpng $(LIBDIR)/libpixman-1.a @@ -126,7 +126,7 @@ $(DOWNLOADS)/physfs/cmakebuild/Makefile: $(DOWNLOADS)/physfs/CMakeLists.txt $(CMAKE) -DPHYSFS_BUILD_STATIC=true -DPHYSFS_BUILD_SHARED=false $(DOWNLOADS)/physfs/CMakeLists.txt: - $(CLONE) $(GITHUB)/criptych/physfs $(DOWNLOADS)/physfs + $(CLONE) $(GITLAB)/mkxp-z/physfs $(DOWNLOADS)/physfs # libpng libpng: init_dirs $(LIBDIR)/libpng.a @@ -141,7 +141,7 @@ $(DOWNLOADS)/libpng/Makefile: $(DOWNLOADS)/libpng/configure --enable-shared=no --enable-static=yes $(DOWNLOADS)/libpng/configure: - $(CLONE) $(GITHUB)/glennrp/libpng $(DOWNLOADS)/libpng + $(CLONE) $(GITLAB)/mkxp-z/libpng $(DOWNLOADS)/libpng # libjpeg libjpeg: init_dirs $(LIBDIR)/libjpeg.a @@ -155,7 +155,7 @@ $(DOWNLOADS)/libjpeg/cmakebuild/Makefile: $(DOWNLOADS)/libjpeg/CMakeLists.txt $(CMAKE) -DENABLE_SHARED=no -DENABLE_STATIC=yes $(DOWNLOADS)/libjpeg/CMakeLists.txt: - $(CLONE) $(GITHUB)/libjpeg-turbo/libjpeg-turbo $(DOWNLOADS)/libjpeg + $(CLONE) $(GITLAB)/mkxp-z/libjpeg-turbo $(DOWNLOADS)/libjpeg # SDL2 sdl2: init_dirs $(LIBDIR)/libSDL2.a @@ -188,13 +188,13 @@ $(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure --disable-imageio \ --enable-png=yes --enable-png-shared=no \ --enable-jpg=yes --enable-jpg-shared=no \ - --enable-webp=no + --enable-webp=no $(SDL2_IMAGE_FLAGS) $(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 + $(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image # SDL2 (ttf) sdl2ttf: init_dirs sdl2 freetype $(LIBDIR)/libSDL2_ttf.a @@ -205,13 +205,13 @@ $(LIBDIR)/libSDL2_ttf.a: $(DOWNLOADS)/sdl2_ttf/Makefile $(DOWNLOADS)/sdl2_ttf/Makefile: $(DOWNLOADS)/sdl2_ttf/configure cd $(DOWNLOADS)/sdl2_ttf; \ - $(CONFIGURE) --enable-static=true --enable-shared=false + $(CONFIGURE) --enable-static=true --enable-shared=false $(SDL2_TTF_FLAGS) $(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 + $(CLONE) $(GITLAB)/mkxp-z/SDL_ttf $(DOWNLOADS)/sdl2_ttf # Freetype (dependency of SDL2_ttf) freetype: init_dirs $(LIBDIR)/libfreetype.a @@ -228,7 +228,7 @@ $(DOWNLOADS)/freetype/configure: $(DOWNLOADS)/freetype/autogen.sh cd $(DOWNLOADS)/freetype; ./autogen.sh $(DOWNLOADS)/freetype/autogen.sh: - $(CLONE) $(GITHUB)/aseprite/freetype2 $(DOWNLOADS)/freetype + $(CLONE) $(GITLAB)/mkxp-z/freetype2 $(DOWNLOADS)/freetype # OpenAL openal: init_dirs libogg $(LIBDIR)/libopenal-soft.a @@ -239,10 +239,10 @@ $(LIBDIR)/libopenal-soft.a: $(DOWNLOADS)/openal/cmakebuild/Makefile $(DOWNLOADS)/openal/cmakebuild/Makefile: $(DOWNLOADS)/openal/CMakeLists.txt cd $(DOWNLOADS)/openal; mkdir cmakebuild; cd cmakebuild; \ - $(CMAKE) -DLIBTYPE=STATIC + $(CMAKE) -DLIBTYPE=STATIC $(OPENAL_FLAGS) $(DOWNLOADS)/openal/CMakeLists.txt: - $(CLONE) $(GITHUB)/kcat/openal-soft $(DOWNLOADS)/openal + $(CLONE) $(GITLAB)/mkxp-z/openal-soft $(DOWNLOADS)/openal # Standard ruby ruby: init_dirs $(LIBDIR)/libruby*.a @@ -253,13 +253,13 @@ $(LIBDIR)/libruby*.a: $(DOWNLOADS)/ruby/Makefile $(DOWNLOADS)/ruby/Makefile: $(DOWNLOADS)/ruby/configure cd $(DOWNLOADS)/ruby; \ - $(CONFIGURE) $(RUBY_CONFIGURE_ARGS) + $(CONFIGURE) $(RUBY_CONFIGURE_ARGS) $(RUBY_FLAGS) $(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 + $(CLONE) $(GITLAB)/mkxp-z/ruby --single-branch --branch ruby_2_6 $(DOWNLOADS)/ruby # Build your own ruby! RUBY_PATH := ${RUBY_PATH} @@ -268,7 +268,7 @@ custom-ruby: custom-ruby-makefile make -j$(NPROC); make install custom-ruby-makefile: custom-ruby-configure - cd $(RUBY_PATH); $(CONFIGURE) ${RUBY_ARGS} + cd $(RUBY_PATH); $(CONFIGURE) $(RUBY_FLAGS) custom-ruby-configure: $(RUBY_PATH)/*.c cd $(RUBY_PATH); autoconf diff --git a/macos/README.md b/macos/README.md index f8829bd4..2098aabc 100644 --- a/macos/README.md +++ b/macos/README.md @@ -19,7 +19,7 @@ make -f .AppleSilicon everything 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 configure-ruby RUBY_PATH="Path to Ruby" RUBY_FLAGS="extra configure arguments" make -f .Intel deps-core ``` @@ -27,4 +27,4 @@ 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 +If you built 1.8, select the PlayerLegacy scheme. \ No newline at end of file diff --git a/macos/mkxp-z.xcodeproj/project.pbxproj b/macos/mkxp-z.xcodeproj/project.pbxproj index ac57fd67..61a57270 100644 --- a/macos/mkxp-z.xcodeproj/project.pbxproj +++ b/macos/mkxp-z.xcodeproj/project.pbxproj @@ -118,124 +118,12 @@ 3B10EE092568E96A00372D13 /* binding-mri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDF02568E96A00372D13 /* binding-mri.cpp */; }; 3B10EE0B2568E96A00372D13 /* module_rpg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDF32568E96A00372D13 /* module_rpg.cpp */; }; 3B10EE0C2568E96A00372D13 /* viewport-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDF42568E96A00372D13 /* viewport-binding.cpp */; }; + 3B426F29256B6C75009EA00F /* libsigc-3.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B426F28256B6C75009EA00F /* libsigc-3.0.a */; }; 3B5A84062569B56F00BAF2E5 /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B5A84052569B56F00BAF2E5 /* config.cpp */; }; 3B5A840D2569BE7C00BAF2E5 /* filesystemImplApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B5A840C2569BE7C00BAF2E5 /* filesystemImplApple.mm */; }; 3B5A84342569F82C00BAF2E5 /* mkxp.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BD2B7282565B35D003DAD8A /* mkxp.json */; }; 3B5A8445256A0F6300BAF2E5 /* libopenal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B5A8444256A0F6300BAF2E5 /* libopenal.a */; }; 3B5A8464256A46B200BAF2E5 /* systemImplApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B5A8463256A46B200BAF2E5 /* systemImplApple.mm */; }; - 3B83DC27256A51B9001991CB /* tilemapvx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED7D2568E95D00372D13 /* tilemapvx.cpp */; }; - 3B83DC28256A51B9001991CB /* SDL_sound.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED112568E8F100372D13 /* SDL_sound.c */; }; - 3B83DC29256A51B9001991CB /* rgssad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED382568E95D00372D13 /* rgssad.cpp */; }; - 3B83DC2A256A51B9001991CB /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED462568E95D00372D13 /* input.cpp */; }; - 3B83DC2B256A51B9001991CB /* tilemap-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDE72568E96A00372D13 /* tilemap-binding.cpp */; }; - 3B83DC2C256A51B9001991CB /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED642568E95D00372D13 /* audio.cpp */; }; - 3B83DC2D256A51B9001991CB /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED562568E95D00372D13 /* main.cpp */; }; - 3B83DC2E256A51B9001991CB /* alstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED5F2568E95D00372D13 /* alstream.cpp */; }; - 3B83DC2F256A51B9001991CB /* table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED4C2568E95D00372D13 /* table.cpp */; }; - 3B83DC30256A51B9001991CB /* table-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDE52568E96A00372D13 /* table-binding.cpp */; }; - 3B83DC31256A51B9001991CB /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B5A84052569B56F00BAF2E5 /* config.cpp */; }; - 3B83DC32256A51B9001991CB /* bitmap-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDE42568E96A00372D13 /* bitmap-binding.cpp */; }; - 3B83DC33256A51B9001991CB /* vorbissource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED6A2568E95D00372D13 /* vorbissource.cpp */; }; - 3B83DC34256A51B9001991CB /* SDL_sound_raw.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED0C2568E8F100372D13 /* SDL_sound_raw.c */; }; - 3B83DC35256A51B9001991CB /* filesystem-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDD72568E96A00372D13 /* filesystem-binding.cpp */; }; - 3B83DC36256A51B9001991CB /* SDL_sound_shn.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED072568E8F100372D13 /* SDL_sound_shn.c */; }; - 3B83DC37256A51B9001991CB /* glstate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED8A2568E95E00372D13 /* glstate.cpp */; }; - 3B83DC38256A51B9001991CB /* gl-fun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED922568E95E00372D13 /* gl-fun.cpp */; }; - 3B83DC39256A51B9001991CB /* sprite-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDDF2568E96A00372D13 /* sprite-binding.cpp */; }; - 3B83DC3A256A51B9001991CB /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED762568E95D00372D13 /* sprite.cpp */; }; - 3B83DC3B256A51B9001991CB /* cusl-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDD92568E96A00372D13 /* cusl-binding.cpp */; }; - 3B83DC3C256A51B9001991CB /* sdlsoundsource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED632568E95D00372D13 /* sdlsoundsource.cpp */; }; - 3B83DC3D256A51B9001991CB /* viewport-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDF42568E96A00372D13 /* viewport-binding.cpp */; }; - 3B83DC3E256A51B9001991CB /* windowvx-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDDD2568E96A00372D13 /* windowvx-binding.cpp */; }; - 3B83DC3F256A51B9001991CB /* windowvx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED722568E95D00372D13 /* windowvx.cpp */; }; - 3B83DC40256A51B9001991CB /* module_rpg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDF32568E96A00372D13 /* module_rpg.cpp */; }; - 3B83DC41256A51B9001991CB /* autotiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDA22568E95E00372D13 /* autotiles.cpp */; }; - 3B83DC42256A51B9001991CB /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED662568E95D00372D13 /* audiostream.cpp */; }; - 3B83DC43256A51B9001991CB /* binding-util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDEF2568E96A00372D13 /* binding-util.cpp */; }; - 3B83DC44256A51B9001991CB /* plane-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDEA2568E96A00372D13 /* plane-binding.cpp */; }; - 3B83DC45256A51B9001991CB /* gl-meta.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED882568E95E00372D13 /* gl-meta.cpp */; }; - 3B83DC46256A51B9001991CB /* etc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED4D2568E95D00372D13 /* etc.cpp */; }; - 3B83DC47256A51B9001991CB /* shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED8C2568E95E00372D13 /* shader.cpp */; }; - 3B83DC48256A51B9001991CB /* tilemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED9C2568E95E00372D13 /* tilemap.cpp */; }; - 3B83DC49256A51B9001991CB /* SDL_sound_au.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED152568E8F100372D13 /* SDL_sound_au.c */; }; - 3B83DC4A256A51B9001991CB /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED742568E95D00372D13 /* window.cpp */; }; - 3B83DC4B256A51B9001991CB /* SDL_sound_wav.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED142568E8F100372D13 /* SDL_sound_wav.c */; }; - 3B83DC4C256A51B9001991CB /* input-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDDC2568E96A00372D13 /* input-binding.cpp */; }; - 3B83DC4D256A51B9001991CB /* keybindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED472568E95D00372D13 /* keybindings.cpp */; }; - 3B83DC4E256A51B9001991CB /* filesystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED542568E95D00372D13 /* filesystem.cpp */; }; - 3B83DC4F256A51B9001991CB /* binding-mri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDF02568E96A00372D13 /* binding-mri.cpp */; }; - 3B83DC50256A51B9001991CB /* settingsmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED6E2568E95D00372D13 /* settingsmenu.cpp */; }; - 3B83DC51256A51B9001991CB /* eventthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED352568E95D00372D13 /* eventthread.cpp */; }; - 3B83DC52256A51B9001991CB /* viewport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED9E2568E95E00372D13 /* viewport.cpp */; }; - 3B83DC53256A51B9001991CB /* gl-debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED832568E95E00372D13 /* gl-debug.cpp */; }; - 3B83DC54256A51B9001991CB /* SDL_sound_vorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED102568E8F100372D13 /* SDL_sound_vorbis.c */; }; - 3B83DC55256A51B9001991CB /* tileatlasvx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED892568E95E00372D13 /* tileatlasvx.cpp */; }; - 3B83DC56256A51B9001991CB /* bitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED732568E95D00372D13 /* bitmap.cpp */; }; - 3B83DC57256A51B9001991CB /* tilemapvx-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDE12568E96A00372D13 /* tilemapvx-binding.cpp */; }; - 3B83DC58256A51B9001991CB /* window-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDD62568E96A00372D13 /* window-binding.cpp */; }; - 3B83DC59256A51B9001991CB /* midisource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED5E2568E95D00372D13 /* midisource.cpp */; }; - 3B83DC5A256A51B9001991CB /* graphics-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDE92568E96A00372D13 /* graphics-binding.cpp */; }; - 3B83DC5B256A51B9001991CB /* plane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDA12568E95E00372D13 /* plane.cpp */; }; - 3B83DC5C256A51B9001991CB /* tilequad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED802568E95D00372D13 /* tilequad.cpp */; }; - 3B83DC5D256A51B9001991CB /* SDL_sound_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED162568E8F100372D13 /* SDL_sound_mp3.c */; }; - 3B83DC5E256A51B9001991CB /* SDL_sound_aiff.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED172568E8F100372D13 /* SDL_sound_aiff.c */; }; - 3B83DC5F256A51B9001991CB /* tileatlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED912568E95E00372D13 /* tileatlas.cpp */; }; - 3B83DC60256A51B9001991CB /* fluid-fun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED602568E95D00372D13 /* fluid-fun.cpp */; }; - 3B83DC61256A51B9001991CB /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED842568E95E00372D13 /* scene.cpp */; }; - 3B83DC62256A51B9001991CB /* texpool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED812568E95D00372D13 /* texpool.cpp */; }; - 3B83DC63256A51B9001991CB /* font-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDEC2568E96A00372D13 /* font-binding.cpp */; }; - 3B83DC64256A51B9001991CB /* SDL_sound_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED092568E8F100372D13 /* SDL_sound_coreaudio.c */; }; - 3B83DC65256A51B9001991CB /* audio-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDDA2568E96A00372D13 /* audio-binding.cpp */; }; - 3B83DC66256A51B9001991CB /* autotilesvx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED9D2568E95E00372D13 /* autotilesvx.cpp */; }; - 3B83DC67256A51B9001991CB /* SDL_sound_voc.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED122568E8F100372D13 /* SDL_sound_voc.c */; }; - 3B83DC68256A51B9001991CB /* vertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED982568E95E00372D13 /* vertex.cpp */; }; - 3B83DC69256A51B9001991CB /* miniffi-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDE82568E96A00372D13 /* miniffi-binding.cpp */; }; - 3B83DC6A256A51B9001991CB /* soundemitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED652568E95D00372D13 /* soundemitter.cpp */; }; - 3B83DC6B256A51B9001991CB /* etc-binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10EDE62568E96A00372D13 /* etc-binding.cpp */; }; - 3B83DC6C256A51B9001991CB /* systemImplApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B5A8463256A46B200BAF2E5 /* systemImplApple.mm */; }; - 3B83DC6D256A51B9001991CB /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED7B2568E95D00372D13 /* graphics.cpp */; }; - 3B83DC6E256A51B9001991CB /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED772568E95D00372D13 /* font.cpp */; }; - 3B83DC6F256A51B9001991CB /* SDL_sound_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED182568E8F100372D13 /* SDL_sound_flac.c */; }; - 3B83DC70256A51B9001991CB /* SDL_sound_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED0D2568E8F100372D13 /* SDL_sound_modplug.c */; }; - 3B83DC71256A51B9001991CB /* filesystemImplApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B5A840C2569BE7C00BAF2E5 /* filesystemImplApple.mm */; }; - 3B83DC72256A51B9001991CB /* fake-api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED5A2568E95D00372D13 /* fake-api.cpp */; }; - 3B83DC73256A51B9001991CB /* sharedstate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED512568E95D00372D13 /* sharedstate.cpp */; }; - 3B83DC75256A51B9001991CB /* libruby.2.6-static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080F4256879FD0006849F /* libruby.2.6-static.a */; }; - 3B83DC76256A51B9001991CB /* libSDL2_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080EF256879FD0006849F /* libSDL2_ttf.a */; }; - 3B83DC77256A51B9001991CB /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FB256879FE0006849F /* libvorbisenc.a */; }; - 3B83DC78256A51B9001991CB /* libSDL2main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080E4256879FC0006849F /* libSDL2main.a */; }; - 3B83DC79256A51B9001991CB /* libopenal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B5A8444256A0F6300BAF2E5 /* libopenal.a */; }; - 3B83DC7A256A51B9001991CB /* libpixman-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080E9256879FC0006849F /* libpixman-1.a */; }; - 3B83DC7B256A51B9001991CB /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FD256879FE0006849F /* libogg.a */; }; - 3B83DC7C256A51B9001991CB /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080EB256879FC0006849F /* libSDL2.a */; }; - 3B83DC7D256A51B9001991CB /* libturbojpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081492568A5F60006849F /* libturbojpeg.a */; }; - 3B83DC7E256A51B9001991CB /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081452568A5C60006849F /* libpng.a */; }; - 3B83DC7F256A51B9001991CB /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080E6256879FC0006849F /* libvorbis.a */; }; - 3B83DC80256A51B9001991CB /* libsigc-2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE08100256879FE0006849F /* libsigc-2.0.a */; }; - 3B83DC81256A51B9001991CB /* libSDL2_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FA256879FE0006849F /* libSDL2_test.a */; }; - 3B83DC82256A51B9001991CB /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08FA425674C9400449CFF /* OpenGL.framework */; }; - 3B83DC83256A51B9001991CB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B47A256534BA003DAD8A /* IOKit.framework */; }; - 3B83DC84256A51B9001991CB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081552568D3A60006849F /* Carbon.framework */; }; - 3B83DC85256A51B9001991CB /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081582568D3A60006849F /* AppKit.framework */; }; - 3B83DC86256A51B9001991CB /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081542568D3A60006849F /* Metal.framework */; }; - 3B83DC87256A51B9001991CB /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081572568D3A60006849F /* ForceFeedback.framework */; }; - 3B83DC88256A51B9001991CB /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081532568D3A60006849F /* CoreVideo.framework */; }; - 3B83DC89256A51B9001991CB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081522568D3A60006849F /* Carbon.framework */; }; - 3B83DC8A256A51B9001991CB /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081562568D3A60006849F /* CoreGraphics.framework */; }; - 3B83DC8B256A51B9001991CB /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081502568D3A50006849F /* libbz2.tbd */; }; - 3B83DC8C256A51B9001991CB /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081512568D3A60006849F /* CoreAudio.framework */; }; - 3B83DC8D256A51B9001991CB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46925651C1B003DAD8A /* AudioToolbox.framework */; }; - 3B83DC8E256A51B9001991CB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46725651C00003DAD8A /* Foundation.framework */; }; - 3B83DC8F256A51B9001991CB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46625651BFC003DAD8A /* CoreFoundation.framework */; }; - 3B83DC90256A51B9001991CB /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46525651BF3003DAD8A /* libz.tbd */; }; - 3B83DC91256A51B9001991CB /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46825651C12003DAD8A /* libiconv.tbd */; }; - 3B83DC92256A51B9001991CB /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080E7256879FC0006849F /* libvorbisfile.a */; }; - 3B83DC93256A51B9001991CB /* libSDL2_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080F0256879FD0006849F /* libSDL2_image.a */; }; - 3B83DC94256A51B9001991CB /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FC256879FE0006849F /* libfreetype.a */; }; - 3B83DC95256A51B9001991CB /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FF256879FE0006849F /* libphysfs.a */; }; - 3B83DC97256A51B9001991CB /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3BDB23E22564546E00C4A63D /* icon.icns */; }; - 3B83DC99256A51B9001991CB /* mkxp.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BD2B7282565B35D003DAD8A /* mkxp.json */; }; - 3B83DC9A256A51B9001991CB /* Assets.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BA08EA4256641ED00449CFF /* Assets.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3BA08E9B256638C900449CFF /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46925651C1B003DAD8A /* AudioToolbox.framework */; }; 3BA08ED4256643C200449CFF /* Assets.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BA08EA4256641ED00449CFF /* Assets.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3BA08FA525674C9900449CFF /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA08FA425674C9400449CFF /* OpenGL.framework */; }; @@ -258,20 +146,12 @@ 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 */; }; 3BE081462568A5C60006849F /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081452568A5C60006849F /* libpng.a */; }; 3BE0814A2568A5F60006849F /* libturbojpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081492568A5F60006849F /* libturbojpeg.a */; }; 3BE081592568D3A60006849F /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081502568D3A50006849F /* libbz2.tbd */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 3B83DC24256A51B9001991CB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3BDB22EC25644FBF00C4A63D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3BA08EA3256641ED00449CFF; - remoteInfo = "mkxpz-resources"; - }; 3BA08ED2256643AD00449CFF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 3BDB22EC25644FBF00C4A63D /* Project object */; @@ -293,17 +173,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3B83DC98256A51B9001991CB /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 7; - files = ( - 3B83DC99256A51B9001991CB /* mkxp.json in CopyFiles */, - 3B83DC9A256A51B9001991CB /* Assets.bundle in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 3BA08EAC2566426200449CFF /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -543,6 +412,7 @@ 3B10EDF32568E96A00372D13 /* module_rpg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = module_rpg.cpp; sourceTree = ""; }; 3B10EDF42568E96A00372D13 /* viewport-binding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "viewport-binding.cpp"; sourceTree = ""; }; 3B10EE1F2569348E00372D13 /* json5pp.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = json5pp.hpp; sourceTree = ""; }; + 3B426F28256B6C75009EA00F /* libsigc-3.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsigc-3.0.a"; path = "Dependencies/build-macosx-x86_64/lib/libsigc-3.0.a"; sourceTree = ""; }; 3B5A84052569B56F00BAF2E5 /* config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = config.cpp; sourceTree = ""; }; 3B5A840C2569BE7C00BAF2E5 /* filesystemImplApple.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = filesystemImplApple.mm; sourceTree = ""; }; 3B5A84132569C28B00BAF2E5 /* filesystemImpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = filesystemImpl.cpp; sourceTree = ""; }; @@ -552,7 +422,6 @@ 3B5A845C256A465700BAF2E5 /* system.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = system.h; sourceTree = ""; }; 3B5A845D256A465700BAF2E5 /* systemImpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = systemImpl.cpp; sourceTree = ""; }; 3B5A8463256A46B200BAF2E5 /* systemImplApple.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = systemImplApple.mm; sourceTree = ""; }; - 3B83DC9E256A51B9001991CB /* mkxp-z.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "mkxp-z.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; 3BA08FA425674C9400449CFF /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; @@ -582,7 +451,6 @@ 3BE080FC256879FE0006849F /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "Dependencies/build-macosx-x86_64/lib/libfreetype.a"; sourceTree = ""; }; 3BE080FD256879FE0006849F /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "Dependencies/build-macosx-x86_64/lib/libogg.a"; sourceTree = ""; }; 3BE080FF256879FE0006849F /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = "Dependencies/build-macosx-x86_64/lib/libphysfs.a"; sourceTree = ""; }; - 3BE08100256879FE0006849F /* libsigc-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsigc-2.0.a"; path = "Dependencies/build-macosx-x86_64/lib/libsigc-2.0.a"; sourceTree = ""; }; 3BE081452568A5C60006849F /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "Dependencies/build-macosx-x86_64/lib/libpng.a"; sourceTree = ""; }; 3BE081492568A5F60006849F /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = "Dependencies/build-macosx-x86_64/lib/libturbojpeg.a"; sourceTree = ""; }; 3BE081502568D3A50006849F /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; }; @@ -597,46 +465,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 3B83DC74256A51B9001991CB /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 3B83DC75256A51B9001991CB /* libruby.2.6-static.a in Frameworks */, - 3B83DC76256A51B9001991CB /* libSDL2_ttf.a in Frameworks */, - 3B83DC77256A51B9001991CB /* libvorbisenc.a in Frameworks */, - 3B83DC78256A51B9001991CB /* libSDL2main.a in Frameworks */, - 3B83DC79256A51B9001991CB /* libopenal.a in Frameworks */, - 3B83DC7A256A51B9001991CB /* libpixman-1.a in Frameworks */, - 3B83DC7B256A51B9001991CB /* libogg.a in Frameworks */, - 3B83DC7C256A51B9001991CB /* libSDL2.a in Frameworks */, - 3B83DC7D256A51B9001991CB /* libturbojpeg.a in Frameworks */, - 3B83DC7E256A51B9001991CB /* libpng.a in Frameworks */, - 3B83DC7F256A51B9001991CB /* libvorbis.a in Frameworks */, - 3B83DC80256A51B9001991CB /* libsigc-2.0.a in Frameworks */, - 3B83DC81256A51B9001991CB /* libSDL2_test.a in Frameworks */, - 3B83DC82256A51B9001991CB /* OpenGL.framework in Frameworks */, - 3B83DC83256A51B9001991CB /* IOKit.framework in Frameworks */, - 3B83DC84256A51B9001991CB /* Carbon.framework in Frameworks */, - 3B83DC85256A51B9001991CB /* AppKit.framework in Frameworks */, - 3B83DC86256A51B9001991CB /* Metal.framework in Frameworks */, - 3B83DC87256A51B9001991CB /* ForceFeedback.framework in Frameworks */, - 3B83DC88256A51B9001991CB /* CoreVideo.framework in Frameworks */, - 3B83DC89256A51B9001991CB /* Carbon.framework in Frameworks */, - 3B83DC8A256A51B9001991CB /* CoreGraphics.framework in Frameworks */, - 3B83DC8B256A51B9001991CB /* libbz2.tbd in Frameworks */, - 3B83DC8C256A51B9001991CB /* CoreAudio.framework in Frameworks */, - 3B83DC8D256A51B9001991CB /* AudioToolbox.framework in Frameworks */, - 3B83DC8E256A51B9001991CB /* Foundation.framework in Frameworks */, - 3B83DC8F256A51B9001991CB /* CoreFoundation.framework in Frameworks */, - 3B83DC90256A51B9001991CB /* libz.tbd in Frameworks */, - 3B83DC91256A51B9001991CB /* libiconv.tbd in Frameworks */, - 3B83DC92256A51B9001991CB /* libvorbisfile.a in Frameworks */, - 3B83DC93256A51B9001991CB /* libSDL2_image.a in Frameworks */, - 3B83DC94256A51B9001991CB /* libfreetype.a in Frameworks */, - 3B83DC95256A51B9001991CB /* libphysfs.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 3BA08EA1256641ED00449CFF /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -659,7 +487,6 @@ 3BE0814A2568A5F60006849F /* libturbojpeg.a in Frameworks */, 3BE081462568A5C60006849F /* libpng.a in Frameworks */, 3BE08104256879FE0006849F /* libvorbis.a in Frameworks */, - 3BE0811E256879FE0006849F /* libsigc-2.0.a in Frameworks */, 3BE08118256879FE0006849F /* libSDL2_test.a in Frameworks */, 3BA08FA525674C9900449CFF /* OpenGL.framework in Frameworks */, 3BD2B6E72565AEC0003DAD8A /* IOKit.framework in Frameworks */, @@ -679,6 +506,7 @@ 3BD2B6ED2565AEC0003DAD8A /* libiconv.tbd in Frameworks */, 3BE08105256879FE0006849F /* libvorbisfile.a in Frameworks */, 3BE0810E256879FE0006849F /* libSDL2_image.a in Frameworks */, + 3B426F29256B6C75009EA00F /* libsigc-3.0.a in Frameworks */, 3BE0811A256879FE0006849F /* libfreetype.a in Frameworks */, 3BE0811D256879FE0006849F /* libphysfs.a in Frameworks */, ); @@ -1053,7 +881,6 @@ children = ( 3BD2B7252565AEC0003DAD8A /* mkxp-z.app */, 3BA08EA4256641ED00449CFF /* Assets.bundle */, - 3B83DC9E256A51B9001991CB /* mkxp-z.app */, ); name = Products; sourceTree = ""; @@ -1098,13 +925,13 @@ 3BE081492568A5F60006849F /* libturbojpeg.a */, 3BE080FF256879FE0006849F /* libphysfs.a */, 3BE080E9256879FC0006849F /* libpixman-1.a */, + 3B426F28256B6C75009EA00F /* libsigc-3.0.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 */, @@ -1115,25 +942,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 3B83DC22256A51B9001991CB /* LegacyPlayer */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3B83DC9B256A51B9001991CB /* Build configuration list for PBXNativeTarget "LegacyPlayer" */; - buildPhases = ( - 3B83DC25256A51B9001991CB /* Sources */, - 3B83DC74256A51B9001991CB /* Frameworks */, - 3B83DC96256A51B9001991CB /* Resources */, - 3B83DC98256A51B9001991CB /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - 3B83DC23256A51B9001991CB /* PBXTargetDependency */, - ); - name = LegacyPlayer; - productName = PlayerLegacy; - productReference = 3B83DC9E256A51B9001991CB /* mkxp-z.app */; - productType = "com.apple.product-type.application"; - }; 3BA08EA3256641ED00449CFF /* Assets */ = { isa = PBXNativeTarget; buildConfigurationList = 3BA08EA9256641EE00449CFF /* Build configuration list for PBXNativeTarget "Assets" */; @@ -1201,20 +1009,11 @@ targets = ( 3BA08EA3256641ED00449CFF /* Assets */, 3BD2B64B2565AEC0003DAD8A /* Player */, - 3B83DC22256A51B9001991CB /* LegacyPlayer */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 3B83DC96256A51B9001991CB /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3B83DC97256A51B9001991CB /* icon.icns in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 3BA08EA2256641ED00449CFF /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1234,90 +1033,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 3B83DC25256A51B9001991CB /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3B83DC27256A51B9001991CB /* tilemapvx.cpp in Sources */, - 3B83DC28256A51B9001991CB /* SDL_sound.c in Sources */, - 3B83DC29256A51B9001991CB /* rgssad.cpp in Sources */, - 3B83DC2A256A51B9001991CB /* input.cpp in Sources */, - 3B83DC2B256A51B9001991CB /* tilemap-binding.cpp in Sources */, - 3B83DC2C256A51B9001991CB /* audio.cpp in Sources */, - 3B83DC2D256A51B9001991CB /* main.cpp in Sources */, - 3B83DC2E256A51B9001991CB /* alstream.cpp in Sources */, - 3B83DC2F256A51B9001991CB /* table.cpp in Sources */, - 3B83DC30256A51B9001991CB /* table-binding.cpp in Sources */, - 3B83DC31256A51B9001991CB /* config.cpp in Sources */, - 3B83DC32256A51B9001991CB /* bitmap-binding.cpp in Sources */, - 3B83DC33256A51B9001991CB /* vorbissource.cpp in Sources */, - 3B83DC34256A51B9001991CB /* SDL_sound_raw.c in Sources */, - 3B83DC35256A51B9001991CB /* filesystem-binding.cpp in Sources */, - 3B83DC36256A51B9001991CB /* SDL_sound_shn.c in Sources */, - 3B83DC37256A51B9001991CB /* glstate.cpp in Sources */, - 3B83DC38256A51B9001991CB /* gl-fun.cpp in Sources */, - 3B83DC39256A51B9001991CB /* sprite-binding.cpp in Sources */, - 3B83DC3A256A51B9001991CB /* sprite.cpp in Sources */, - 3B83DC3B256A51B9001991CB /* cusl-binding.cpp in Sources */, - 3B83DC3C256A51B9001991CB /* sdlsoundsource.cpp in Sources */, - 3B83DC3D256A51B9001991CB /* viewport-binding.cpp in Sources */, - 3B83DC3E256A51B9001991CB /* windowvx-binding.cpp in Sources */, - 3B83DC3F256A51B9001991CB /* windowvx.cpp in Sources */, - 3B83DC40256A51B9001991CB /* module_rpg.cpp in Sources */, - 3B83DC41256A51B9001991CB /* autotiles.cpp in Sources */, - 3B83DC42256A51B9001991CB /* audiostream.cpp in Sources */, - 3B83DC43256A51B9001991CB /* binding-util.cpp in Sources */, - 3B83DC44256A51B9001991CB /* plane-binding.cpp in Sources */, - 3B83DC45256A51B9001991CB /* gl-meta.cpp in Sources */, - 3B83DC46256A51B9001991CB /* etc.cpp in Sources */, - 3B83DC47256A51B9001991CB /* shader.cpp in Sources */, - 3B83DC48256A51B9001991CB /* tilemap.cpp in Sources */, - 3B83DC49256A51B9001991CB /* SDL_sound_au.c in Sources */, - 3B83DC4A256A51B9001991CB /* window.cpp in Sources */, - 3B83DC4B256A51B9001991CB /* SDL_sound_wav.c in Sources */, - 3B83DC4C256A51B9001991CB /* input-binding.cpp in Sources */, - 3B83DC4D256A51B9001991CB /* keybindings.cpp in Sources */, - 3B83DC4E256A51B9001991CB /* filesystem.cpp in Sources */, - 3B83DC4F256A51B9001991CB /* binding-mri.cpp in Sources */, - 3B83DC50256A51B9001991CB /* settingsmenu.cpp in Sources */, - 3B83DC51256A51B9001991CB /* eventthread.cpp in Sources */, - 3B83DC52256A51B9001991CB /* viewport.cpp in Sources */, - 3B83DC53256A51B9001991CB /* gl-debug.cpp in Sources */, - 3B83DC54256A51B9001991CB /* SDL_sound_vorbis.c in Sources */, - 3B83DC55256A51B9001991CB /* tileatlasvx.cpp in Sources */, - 3B83DC56256A51B9001991CB /* bitmap.cpp in Sources */, - 3B83DC57256A51B9001991CB /* tilemapvx-binding.cpp in Sources */, - 3B83DC58256A51B9001991CB /* window-binding.cpp in Sources */, - 3B83DC59256A51B9001991CB /* midisource.cpp in Sources */, - 3B83DC5A256A51B9001991CB /* graphics-binding.cpp in Sources */, - 3B83DC5B256A51B9001991CB /* plane.cpp in Sources */, - 3B83DC5C256A51B9001991CB /* tilequad.cpp in Sources */, - 3B83DC5D256A51B9001991CB /* SDL_sound_mp3.c in Sources */, - 3B83DC5E256A51B9001991CB /* SDL_sound_aiff.c in Sources */, - 3B83DC5F256A51B9001991CB /* tileatlas.cpp in Sources */, - 3B83DC60256A51B9001991CB /* fluid-fun.cpp in Sources */, - 3B83DC61256A51B9001991CB /* scene.cpp in Sources */, - 3B83DC62256A51B9001991CB /* texpool.cpp in Sources */, - 3B83DC63256A51B9001991CB /* font-binding.cpp in Sources */, - 3B83DC64256A51B9001991CB /* SDL_sound_coreaudio.c in Sources */, - 3B83DC65256A51B9001991CB /* audio-binding.cpp in Sources */, - 3B83DC66256A51B9001991CB /* autotilesvx.cpp in Sources */, - 3B83DC67256A51B9001991CB /* SDL_sound_voc.c in Sources */, - 3B83DC68256A51B9001991CB /* vertex.cpp in Sources */, - 3B83DC69256A51B9001991CB /* miniffi-binding.cpp in Sources */, - 3B83DC6A256A51B9001991CB /* soundemitter.cpp in Sources */, - 3B83DC6B256A51B9001991CB /* etc-binding.cpp in Sources */, - 3B83DC6C256A51B9001991CB /* systemImplApple.mm in Sources */, - 3B83DC6D256A51B9001991CB /* graphics.cpp in Sources */, - 3B83DC6E256A51B9001991CB /* font.cpp in Sources */, - 3B83DC6F256A51B9001991CB /* SDL_sound_flac.c in Sources */, - 3B83DC70256A51B9001991CB /* SDL_sound_modplug.c in Sources */, - 3B83DC71256A51B9001991CB /* filesystemImplApple.mm in Sources */, - 3B83DC72256A51B9001991CB /* fake-api.cpp in Sources */, - 3B83DC73256A51B9001991CB /* sharedstate.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 3BA08EA0256641ED00449CFF /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1412,11 +1127,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 3B83DC23256A51B9001991CB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3BA08EA3256641ED00449CFF /* Assets */; - targetProxy = 3B83DC24256A51B9001991CB /* PBXContainerItemProxy */; - }; 3BA08ED3256643AD00449CFF /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 3BA08EA3256641ED00449CFF /* Assets */; @@ -1425,185 +1135,6 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 3B83DC9C256A51B9001991CB /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3BDB240A2564715C00C4A63D /* Config.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = x86_64; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = NO; - 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_ENTITLEMENTS = ""; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.0; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_ASSET_PATHS = ""; - DEVELOPMENT_TEAM = ""; - ENABLE_HARDENED_RUNTIME = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_INPUT_FILETYPE = automatic; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - EASY_POKE, - LEGACY_RUBY, - ); - 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; - HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 2.0; - MRI_VERSION = 1.8.7; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = ( - "$(inherited)", - "-w", - ); - OTHER_CODE_SIGN_FLAGS = "$(inherited)"; - OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = com.zoro.mkxpz; - PRODUCT_NAME = "mkxp-z"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = macosx; - }; - name = Debug; - }; - 3B83DC9D256A51B9001991CB /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3BDB240A2564715C00C4A63D /* Config.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = x86_64; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = NO; - 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_ENTITLEMENTS = ""; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.0; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_ASSET_PATHS = ""; - DEVELOPMENT_TEAM = ""; - ENABLE_HARDENED_RUNTIME = NO; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_INPUT_FILETYPE = automatic; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - EASY_POKE, - LEGACY_RUBY, - ); - 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; - HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 2.0; - MRI_VERSION = 1.8.7; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - OTHER_CFLAGS = ( - "$(inherited)", - "-w", - ); - OTHER_CODE_SIGN_FLAGS = "$(inherited)"; - OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = com.zoro.mkxpz; - PRODUCT_NAME = "mkxp-z"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = macosx; - }; - name = Release; - }; 3BA08EA7256641EE00449CFF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1749,8 +1280,6 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; @@ -1777,24 +1306,17 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/entitlements.plist"; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 2.0; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; - DEVELOPMENT_TEAM = ""; - ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_DYNAMIC_NO_PIC = NO; - GCC_INPUT_FILETYPE = automatic; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1811,13 +1333,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", - ); - MACOSX_DEPLOYMENT_TARGET = 10.13; + LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 2.0; - MRI_VERSION = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1825,7 +1342,6 @@ "$(inherited)", "-w", ); - OTHER_CODE_SIGN_FLAGS = "$(inherited)"; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_NAME = "mkxp-z"; @@ -1843,8 +1359,6 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; @@ -1871,22 +1385,15 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/entitlements.plist"; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 2.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; - DEVELOPMENT_TEAM = ""; - ENABLE_HARDENED_RUNTIME = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_INPUT_FILETYPE = automatic; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1903,20 +1410,14 @@ "$(inherited)", "@executable_path/../Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", - ); - MACOSX_DEPLOYMENT_TARGET = 10.13; + LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 2.0; - MRI_VERSION = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( "$(inherited)", "-w", ); - OTHER_CODE_SIGN_FLAGS = "$(inherited)"; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_NAME = "mkxp-z"; @@ -1930,6 +1431,7 @@ baseConfigurationReference = 3BDB240A2564715C00C4A63D /* Config.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; GCC_PREPROCESSOR_DEFINITIONS = ( MKXPZ_BUILD_XCODE, "ALCDEVICE_STRUCT=ALCdevice", @@ -1941,7 +1443,7 @@ "$(DEPENDENCY_SEARCH_PATH)/include", "$(DEPENDENCY_SEARCH_PATH)/lib/**", "$(DEPENDENCY_SEARCH_PATH)/include/SDL2", - "$(DEPENDENCY_SEARCH_PATH)/include/sigc++-2.0", + "$(DEPENDENCY_SEARCH_PATH)/include/sigc++-3.0", "$(DEPENDENCY_SEARCH_PATH)/include/pixman-1", "$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)", "$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/$(BUILD_ARCH)-darwin", @@ -1953,6 +1455,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; + OTHER_CODE_SIGN_FLAGS = "--ignore-resources"; PRODUCT_BUNDLE_IDENTIFIER = com.zoro.mkxpz; }; name = Debug; @@ -1962,6 +1465,7 @@ baseConfigurationReference = 3BDB240A2564715C00C4A63D /* Config.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; GCC_PREPROCESSOR_DEFINITIONS = ( MKXPZ_BUILD_XCODE, "ALCDEVICE_STRUCT=ALCdevice", @@ -1973,7 +1477,7 @@ "$(DEPENDENCY_SEARCH_PATH)/include", "$(DEPENDENCY_SEARCH_PATH)/lib/**", "$(DEPENDENCY_SEARCH_PATH)/include/SDL2", - "$(DEPENDENCY_SEARCH_PATH)/include/sigc++-2.0", + "$(DEPENDENCY_SEARCH_PATH)/include/sigc++-3.0", "$(DEPENDENCY_SEARCH_PATH)/include/pixman-1", "$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)", "$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/$(BUILD_ARCH)-darwin", @@ -1985,6 +1489,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; + OTHER_CODE_SIGN_FLAGS = "--ignore-resources"; PRODUCT_BUNDLE_IDENTIFIER = com.zoro.mkxpz; }; name = Release; @@ -1992,15 +1497,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 3B83DC9B256A51B9001991CB /* Build configuration list for PBXNativeTarget "LegacyPlayer" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3B83DC9C256A51B9001991CB /* Debug */, - 3B83DC9D256A51B9001991CB /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 3BA08EA9256641EE00449CFF /* Build configuration list for PBXNativeTarget "Assets" */ = { isa = XCConfigurationList; buildConfigurations = (