diff --git a/macos/.gitignore b/macos/.gitignore deleted file mode 100644 index b9274c89..00000000 --- a/macos/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -DerivedData/ -gls* \ No newline at end of file diff --git a/macos/Config.xcconfig b/macos/Config.xcconfig index d78b307c..bfc1e638 100644 --- a/macos/Config.xcconfig +++ b/macos/Config.xcconfig @@ -8,34 +8,16 @@ // Uncomment this for the Essentials crap // GCC_PREPROCESSOR_DEFINITIONS = $(inherited) EASY_POKE +SDK_ROOT = macosx +BUILD_ARCH = x86_64 + // The path to your build dependencies -DEPENDENCY_SEARCH_PATH = $(PROJECT_DIR)/Dependencies/build-$(SDKROOT)-$(CURRENT_ARCH) +DEPENDENCY_SEARCH_PATH = $(PROJECT_DIR)/Dependencies/build-$(SDK_ROOT)-$(BUILD_ARCH) // 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 USE_MINIFFI - -GCC_C_LANGUAGE_STANDARD = gnu11 -GCC_CXX_LANGUAGE_STANDARD = c++11 - -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) Dependencies ../build - -HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/include/SDL2" - -// sigc++ -HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/include/sigc++-2.0" - -// pixman -HEADER_SEARCH_PATHS = $(inherited) "$(DEPENDENCY_SEARCH_PATH)/include/pixman-1" +EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = $(inherited) Dependencies ../build DerivedData // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 diff --git a/macos/mkxp-z.xcodeproj/project.pbxproj b/macos/mkxp-z.xcodeproj/project.pbxproj index 739b06c1..65396024 100644 --- a/macos/mkxp-z.xcodeproj/project.pbxproj +++ b/macos/mkxp-z.xcodeproj/project.pbxproj @@ -409,6 +409,7 @@ 3B10EDF42568E96A00372D13 /* viewport-binding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "viewport-binding.cpp"; sourceTree = ""; }; 3B10EE122568EA0900372D13 /* CocoaHelpers.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CocoaHelpers.mm; sourceTree = SOURCE_ROOT; }; 3B10EE132568EA0900372D13 /* CocoaHelpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CocoaHelpers.hpp; sourceTree = SOURCE_ROOT; }; + 3B10EE1F2569348E00372D13 /* json5pp.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = json5pp.hpp; 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 = ""; }; 3BA08FA425674C9400449CFF /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; @@ -426,24 +427,24 @@ 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 = ""; }; - 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 = ""; }; + 3BE080E4256879FC0006849F /* libSDL2main.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2main.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2main.a"; sourceTree = ""; }; + 3BE080E6256879FC0006849F /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "Dependencies/build-macosx-x86_64/lib/libvorbis.a"; sourceTree = ""; }; + 3BE080E7256879FC0006849F /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = "Dependencies/build-macosx-x86_64/lib/libvorbisfile.a"; sourceTree = ""; }; + 3BE080E9256879FC0006849F /* libpixman-1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpixman-1.a"; path = "Dependencies/build-macosx-x86_64/lib/libpixman-1.a"; sourceTree = ""; }; + 3BE080EB256879FC0006849F /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2.a"; sourceTree = ""; }; + 3BE080ED256879FD0006849F /* libobjfwbridge.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfwbridge.a; path = "Dependencies/build-macosx-x86_64/lib/libobjfwbridge.a"; sourceTree = ""; }; + 3BE080EF256879FD0006849F /* libSDL2_ttf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_ttf.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2_ttf.a"; sourceTree = ""; }; + 3BE080F0256879FD0006849F /* libSDL2_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_image.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2_image.a"; sourceTree = ""; }; + 3BE080F2256879FD0006849F /* libobjfw.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw.a; path = "Dependencies/build-macosx-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-macosx-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-macosx-x86_64/lib/libSDL2_test.a"; sourceTree = ""; }; + 3BE080FB256879FE0006849F /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = "Dependencies/build-macosx-x86_64/lib/libvorbisenc.a"; sourceTree = ""; }; + 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; }; 3BE081512568D3A60006849F /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 3BE081522568D3A60006849F /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; @@ -634,6 +635,7 @@ 3B10ED402568E95D00372D13 /* util.h */, 3B10ED412568E95D00372D13 /* exception.h */, 3B10ED422568E95D00372D13 /* debugwriter.h */, + 3B10EE1F2569348E00372D13 /* json5pp.hpp */, ); path = util; sourceTree = ""; @@ -1326,7 +1328,11 @@ GCC_INPUT_FILETYPE = automatic; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + GCC_PREPROCESSOR_DEFINITIONS = ( + MKXPZ_BUILD_XCODE, + "ALCDEVICE_STRUCT=ALCdevice_struct", + USE_MINIFFI, + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1334,9 +1340,14 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)\"", - "\"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/x86_64-darwin\"", + "$(PROJECT_DIR)/../**", + "$(DEPENDENCY_SEARCH_PATH)/include", + "$(DEPENDENCY_SEARCH_PATH)/lib/**", + "$(DEPENDENCY_SEARCH_PATH)/include/SDL2", + "$(DEPENDENCY_SEARCH_PATH)/include/sigc++-2.0", + "$(DEPENDENCY_SEARCH_PATH)/include/pixman-1", + "$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)", + "$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/$(BUILD_ARCH)-darwin", ); INFOPLIST_FILE = Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1344,8 +1355,8 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = ( + "$(DEPENDENCY_SEARCH_PATH)/lib", "$(inherited)", - "$(PROJECT_DIR)/Dependencies/build-x86_64/lib", ); MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 2.0; @@ -1355,6 +1366,8 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", + "-fconstant-string-class=OFConstantString", + "-fno-constant-cfstrings", "-w", ); OTHER_CODE_SIGN_FLAGS = "--deep --force"; @@ -1417,7 +1430,11 @@ GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_INPUT_FILETYPE = automatic; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + GCC_PREPROCESSOR_DEFINITIONS = ( + MKXPZ_BUILD_XCODE, + "ALCDEVICE_STRUCT=ALCdevice_struct", + USE_MINIFFI, + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1425,9 +1442,14 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)\"", - "\"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/x86_64-darwin\"", + "$(PROJECT_DIR)/../**", + "$(DEPENDENCY_SEARCH_PATH)/include", + "$(DEPENDENCY_SEARCH_PATH)/lib/**", + "$(DEPENDENCY_SEARCH_PATH)/include/SDL2", + "$(DEPENDENCY_SEARCH_PATH)/include/sigc++-2.0", + "$(DEPENDENCY_SEARCH_PATH)/include/pixman-1", + "$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)", + "$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/$(BUILD_ARCH)-darwin", ); INFOPLIST_FILE = Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1435,8 +1457,8 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = ( + "$(DEPENDENCY_SEARCH_PATH)/lib", "$(inherited)", - "$(PROJECT_DIR)/Dependencies/build-x86_64/lib", ); MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 2.0; @@ -1445,6 +1467,8 @@ MTL_FAST_MATH = YES; OTHER_CFLAGS = ( "$(inherited)", + "-fconstant-string-class=OFConstantString", + "-fno-constant-cfstrings", "-w", ); OTHER_CODE_SIGN_FLAGS = "--deep --force"; 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 2afa4203..7adcfc61 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/xcdebugger/Breakpoints_v2.xcbkptlist b/macos/mkxp-z.xcodeproj/xcuserdata/zoroark.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist deleted file mode 100644 index d35ab780..00000000 --- a/macos/mkxp-z.xcodeproj/xcuserdata/zoroark.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ /dev/null @@ -1,6 +0,0 @@ - - - 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 283cf356..c37fae93 100644 --- a/macos/mkxp-z.xcodeproj/xcuserdata/zoroark.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/macos/mkxp-z.xcodeproj/xcuserdata/zoroark.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,49 +9,11 @@ orderHint 1 - Obtain Dependencies.xcscheme_^#shared#^_ - - orderHint - 1 - - Player copy.xcscheme_^#shared#^_ - - orderHint - 4 - Player.xcscheme_^#shared#^_ orderHint 0 - Remove Dependencies.xcscheme_^#shared#^_ - - orderHint - 1 - - gen.xcscheme_^#shared#^_ - - orderHint - 2 - - mkxpz-resources.xcscheme_^#shared#^_ - - orderHint - 4 - - - SuppressBuildableAutocreation - - 3BD2B64B2565AEC0003DAD8A - - primary - - - 3BDB22F52564501400C4A63D - - primary - -