Move variables from xcconfig to target

This commit is contained in:
ゾロアーク 2020-11-21 15:48:01 -05:00
parent da8f04d8f8
commit a3b69204bd
6 changed files with 57 additions and 97 deletions

2
macos/.gitignore vendored
View file

@ -1,2 +0,0 @@
DerivedData/
gls*

View file

@ -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

View file

@ -409,6 +409,7 @@
3B10EDF42568E96A00372D13 /* viewport-binding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "viewport-binding.cpp"; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
3BDB240A2564715C00C4A63D /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
3BDB25C52565184600C4A63D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3BE080E4256879FC0006849F /* libSDL2main.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2main.a; path = "Dependencies/build-x86_64/lib/libSDL2main.a"; sourceTree = "<group>"; };
3BE080E6256879FC0006849F /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "Dependencies/build-x86_64/lib/libvorbis.a"; sourceTree = "<group>"; };
3BE080E7256879FC0006849F /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = "Dependencies/build-x86_64/lib/libvorbisfile.a"; sourceTree = "<group>"; };
3BE080E9256879FC0006849F /* libpixman-1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpixman-1.a"; path = "Dependencies/build-x86_64/lib/libpixman-1.a"; sourceTree = "<group>"; };
3BE080EB256879FC0006849F /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = "Dependencies/build-x86_64/lib/libSDL2.a"; sourceTree = "<group>"; };
3BE080ED256879FD0006849F /* libobjfwbridge.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfwbridge.a; path = "Dependencies/build-x86_64/lib/libobjfwbridge.a"; sourceTree = "<group>"; };
3BE080EF256879FD0006849F /* libSDL2_ttf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_ttf.a; path = "Dependencies/build-x86_64/lib/libSDL2_ttf.a"; sourceTree = "<group>"; };
3BE080F0256879FD0006849F /* libSDL2_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_image.a; path = "Dependencies/build-x86_64/lib/libSDL2_image.a"; sourceTree = "<group>"; };
3BE080F2256879FD0006849F /* libobjfw.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw.a; path = "Dependencies/build-x86_64/lib/libobjfw.a"; sourceTree = "<group>"; };
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 = "<group>"; };
3BE080FA256879FE0006849F /* libSDL2_test.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_test.a; path = "Dependencies/build-x86_64/lib/libSDL2_test.a"; sourceTree = "<group>"; };
3BE080FB256879FE0006849F /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = "Dependencies/build-x86_64/lib/libvorbisenc.a"; sourceTree = "<group>"; };
3BE080FC256879FE0006849F /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "Dependencies/build-x86_64/lib/libfreetype.a"; sourceTree = "<group>"; };
3BE080FD256879FE0006849F /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "Dependencies/build-x86_64/lib/libogg.a"; sourceTree = "<group>"; };
3BE080FF256879FE0006849F /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = "Dependencies/build-x86_64/lib/libphysfs.a"; sourceTree = "<group>"; };
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 = "<group>"; };
3BE081452568A5C60006849F /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "Dependencies/build-x86_64/lib/libpng.a"; sourceTree = "<group>"; };
3BE081492568A5F60006849F /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = "Dependencies/build-x86_64/lib/libturbojpeg.a"; sourceTree = "<group>"; };
3BE080E4256879FC0006849F /* libSDL2main.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2main.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2main.a"; sourceTree = "<group>"; };
3BE080E6256879FC0006849F /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "Dependencies/build-macosx-x86_64/lib/libvorbis.a"; sourceTree = "<group>"; };
3BE080E7256879FC0006849F /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = "Dependencies/build-macosx-x86_64/lib/libvorbisfile.a"; sourceTree = "<group>"; };
3BE080E9256879FC0006849F /* libpixman-1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpixman-1.a"; path = "Dependencies/build-macosx-x86_64/lib/libpixman-1.a"; sourceTree = "<group>"; };
3BE080EB256879FC0006849F /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2.a"; sourceTree = "<group>"; };
3BE080ED256879FD0006849F /* libobjfwbridge.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfwbridge.a; path = "Dependencies/build-macosx-x86_64/lib/libobjfwbridge.a"; sourceTree = "<group>"; };
3BE080EF256879FD0006849F /* libSDL2_ttf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_ttf.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2_ttf.a"; sourceTree = "<group>"; };
3BE080F0256879FD0006849F /* libSDL2_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_image.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2_image.a"; sourceTree = "<group>"; };
3BE080F2256879FD0006849F /* libobjfw.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw.a; path = "Dependencies/build-macosx-x86_64/lib/libobjfw.a"; sourceTree = "<group>"; };
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 = "<group>"; };
3BE080FA256879FE0006849F /* libSDL2_test.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_test.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2_test.a"; sourceTree = "<group>"; };
3BE080FB256879FE0006849F /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = "Dependencies/build-macosx-x86_64/lib/libvorbisenc.a"; sourceTree = "<group>"; };
3BE080FC256879FE0006849F /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "Dependencies/build-macosx-x86_64/lib/libfreetype.a"; sourceTree = "<group>"; };
3BE080FD256879FE0006849F /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "Dependencies/build-macosx-x86_64/lib/libogg.a"; sourceTree = "<group>"; };
3BE080FF256879FE0006849F /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = "Dependencies/build-macosx-x86_64/lib/libphysfs.a"; sourceTree = "<group>"; };
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 = "<group>"; };
3BE081452568A5C60006849F /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "Dependencies/build-macosx-x86_64/lib/libpng.a"; sourceTree = "<group>"; };
3BE081492568A5F60006849F /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = "Dependencies/build-macosx-x86_64/lib/libturbojpeg.a"; sourceTree = "<group>"; };
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 = "<group>";
@ -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";

View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "39122FB9-4F55-4590-9DCD-CE3ED9F5399A"
type = "1"
version = "2.0">
</Bucket>

View file

@ -9,49 +9,11 @@
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>Obtain Dependencies.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>Player copy.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>Player.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>Remove Dependencies.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>gen.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>mkxpz-resources.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>3BD2B64B2565AEC0003DAD8A</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>3BDB22F52564501400C4A63D</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>