mirror of
https://github.com/mkxp-z/mkxp-z.git
synced 2025-07-02 06:35:18 +02:00
Merge pull request #57 from WaywardHeart/macos-build-fixes
Macos build fixes
This commit is contained in:
Splendide Imaginarius
GitHub
commit
8b2363a5d0
4 changed files with 21 additions and 18 deletions
|
|
@ -298,8 +298,7 @@ $(DOWNLOADS)/openssl/Makefile: $(DOWNLOADS)/openssl/Configure
|
|||
--openssldir="$(BUILD_PREFIX)"
|
||||
|
||||
$(DOWNLOADS)/openssl/Configure:
|
||||
$(CLONE) $(GITHUB)/openssl/openssl $(DOWNLOADS)/openssl; \
|
||||
cd $(DOWNLOADS)/openssl --single-branch --branch OpenSSL_1_1_1i --depth 1
|
||||
$(CLONE) $(GITHUB)/openssl/openssl $(DOWNLOADS)/openssl --single-branch --branch OpenSSL_1_1_1i --depth 1
|
||||
|
||||
# Standard ruby
|
||||
ruby: init_dirs openssl $(LIBDIR)/libruby.3.1.dylib
|
||||
|
|
|
|||
|
|
@ -534,10 +534,10 @@
|
|||
ECEC415E939B13D8C959F8D7 /* libhwy.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C3D4EBA94DA7A5C543A337E /* libhwy.a */; };
|
||||
EF05486C9854302CD39A0B80 /* libhwy.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 667B4E3FBC5B03611D5C334E /* libhwy.a */; };
|
||||
F7CA439883B85807B560AF67 /* libhwy.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 667B4E3FBC5B03611D5C334E /* libhwy.a */; };
|
||||
FE5204162A08E27D0070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; };
|
||||
FE5204172A08E2880070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; };
|
||||
FE5204182A08E28F0070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; };
|
||||
FE5204192A08E2950070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; };
|
||||
FE5204162A08E27D0070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
|
||||
FE5204172A08E2880070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
|
||||
FE5204182A08E28F0070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
|
||||
FE5204192A08E2950070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
|
||||
FE52041B2A08E58D0070038A /* lanczos3.frag in Resources */ = {isa = PBXBuildFile; fileRef = FE52041A2A08E58D0070038A /* lanczos3.frag */; };
|
||||
FE52041C2A08E62F0070038A /* lanczos3.frag in CopyFiles */ = {isa = PBXBuildFile; fileRef = FE52041A2A08E58D0070038A /* lanczos3.frag */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
||||
/* End PBXBuildFile section */
|
||||
|
|
@ -1942,7 +1942,6 @@
|
|||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 3B1C23EF25A19C600075EF5D /* Build configuration list for PBXNativeTarget "Z-steam" */;
|
||||
buildPhases = (
|
||||
FE4F72FE2A179EE0004FED68 /* ShellScript */,
|
||||
3B1C237025A19C600075EF5D /* Sources */,
|
||||
3B1C23C225A19C600075EF5D /* Frameworks */,
|
||||
3B1C23E625A19C600075EF5D /* Resources */,
|
||||
|
|
@ -1951,6 +1950,7 @@
|
|||
3B1C23EA25A19C600075EF5D /* CopyFiles */,
|
||||
3B251DAB26DA2EBB00E5D09B /* CopyFiles */,
|
||||
3B1C23EC25A19C600075EF5D /* Embed Frameworks */,
|
||||
FE4F72FE2A179EE0004FED68 /* ShellScript */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
|
|
@ -1986,7 +1986,6 @@
|
|||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 3BBE88062705A73400A574AE /* Build configuration list for PBXNativeTarget "Z-steam-universal" */;
|
||||
buildPhases = (
|
||||
FE4F72FD2A179ED5004FED68 /* ShellScript */,
|
||||
3BBE87852705A73400A574AE /* Sources */,
|
||||
3BBE87CE2705A73400A574AE /* Frameworks */,
|
||||
3BBE87F42705A73400A574AE /* Resources */,
|
||||
|
|
@ -1995,6 +1994,7 @@
|
|||
3BBE87FC2705A73400A574AE /* CopyFiles */,
|
||||
3BBE87FE2705A73400A574AE /* CopyFiles */,
|
||||
3BBE88002705A73400A574AE /* Embed Frameworks */,
|
||||
FE4F72FD2A179ED5004FED68 /* ShellScript */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
|
|
@ -2011,7 +2011,6 @@
|
|||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 3BC65E122584F3AD0063AFF1 /* Build configuration list for PBXNativeTarget "Z-universal" */;
|
||||
buildPhases = (
|
||||
FE4F72FB2A179D9E004FED68 /* ShellScript */,
|
||||
3BC65D8D2584F3AD0063AFF1 /* Sources */,
|
||||
3BC65DDB2584F3AD0063AFF1 /* Frameworks */,
|
||||
3BC65E0D2584F3AD0063AFF1 /* Resources */,
|
||||
|
|
@ -2019,6 +2018,7 @@
|
|||
3BC65E0F2584F3AD0063AFF1 /* CopyFiles */,
|
||||
3B251D9F26DA2C2A00E5D09B /* CopyFiles */,
|
||||
3B522D79259BA0E3003301C4 /* Embed Frameworks */,
|
||||
FE4F72FB2A179D9E004FED68 /* ShellScript */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
|
|
@ -2034,7 +2034,6 @@
|
|||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 3BD2B7222565AEC0003DAD8A /* Build configuration list for PBXNativeTarget "Z-intel" */;
|
||||
buildPhases = (
|
||||
FE4F72FC2A179ECC004FED68 /* ShellScript */,
|
||||
3BD2B64C2565AEC0003DAD8A /* Sources */,
|
||||
3BD2B6E12565AEC0003DAD8A /* Frameworks */,
|
||||
3BD2B6F82565AEC0003DAD8A /* Resources */,
|
||||
|
|
@ -2042,6 +2041,7 @@
|
|||
3B5A843B2569F95A00BAF2E5 /* CopyFiles */,
|
||||
3B251DA726DA2E8A00E5D09B /* CopyFiles */,
|
||||
3B522D7C259BA0E8003301C4 /* Embed Frameworks */,
|
||||
FE4F72FC2A179ECC004FED68 /* ShellScript */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
|
|
@ -2154,6 +2154,7 @@
|
|||
inputFileListPaths = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}",
|
||||
);
|
||||
outputFileListPaths = (
|
||||
);
|
||||
|
|
@ -2161,7 +2162,7 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nCOMMIT_HASH=`git rev-parse --short HEAD`\n/usr/libexec/PlistBuddy -c \"Set :GIT_COMMIT_HASH $COMMIT_HASH\" \"${INFOPLIST_FILE}\"\n";
|
||||
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nCOMMIT_HASH=`git rev-parse --short HEAD`\n/usr/libexec/PlistBuddy -c \"Set :GIT_COMMIT_HASH $COMMIT_HASH\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n";
|
||||
};
|
||||
FE4F72FC2A179ECC004FED68 /* ShellScript */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
|
|
@ -2171,6 +2172,7 @@
|
|||
inputFileListPaths = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}",
|
||||
);
|
||||
outputFileListPaths = (
|
||||
);
|
||||
|
|
@ -2178,7 +2180,7 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nCOMMIT_HASH=`git rev-parse --short HEAD`\n/usr/libexec/PlistBuddy -c \"Set :GIT_COMMIT_HASH $COMMIT_HASH\" \"${INFOPLIST_FILE}\"\n";
|
||||
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nCOMMIT_HASH=`git rev-parse --short HEAD`\n/usr/libexec/PlistBuddy -c \"Set :GIT_COMMIT_HASH $COMMIT_HASH\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n";
|
||||
};
|
||||
FE4F72FD2A179ED5004FED68 /* ShellScript */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
|
|
@ -2188,6 +2190,7 @@
|
|||
inputFileListPaths = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}",
|
||||
);
|
||||
outputFileListPaths = (
|
||||
);
|
||||
|
|
@ -2195,7 +2198,7 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nCOMMIT_HASH=`git rev-parse --short HEAD`\n/usr/libexec/PlistBuddy -c \"Set :GIT_COMMIT_HASH $COMMIT_HASH\" \"${INFOPLIST_FILE}\"\n";
|
||||
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nCOMMIT_HASH=`git rev-parse --short HEAD`\n/usr/libexec/PlistBuddy -c \"Set :GIT_COMMIT_HASH $COMMIT_HASH\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n";
|
||||
};
|
||||
FE4F72FE2A179EE0004FED68 /* ShellScript */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
|
|
@ -2205,6 +2208,7 @@
|
|||
inputFileListPaths = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}",
|
||||
);
|
||||
outputFileListPaths = (
|
||||
);
|
||||
|
|
@ -2212,7 +2216,7 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nCOMMIT_HASH=`git rev-parse --short HEAD`\n/usr/libexec/PlistBuddy -c \"Set :GIT_COMMIT_HASH $COMMIT_HASH\" \"${INFOPLIST_FILE}\"\n";
|
||||
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nCOMMIT_HASH=`git rev-parse --short HEAD`\n/usr/libexec/PlistBuddy -c \"Set :GIT_COMMIT_HASH $COMMIT_HASH\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n";
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ s.d.ca.dir = (axis.value >= 0) ? AxisDir::Positive : AxisDir::Negative;
|
|||
checkButtonAlt(leftShoulder, SDL_CONTROLLER_BUTTON_LEFTSHOULDER, 12)
|
||||
checkButtonAlt(rightShoulder, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, 12)
|
||||
|
||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_14_1
|
||||
#if defined(__MAC_10_14_1) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_14_1
|
||||
// Requires macOS 10.14.1+
|
||||
checkButtonAlt(leftThumbstickButton, SDL_CONTROLLER_BUTTON_LEFTSTICK, 14)
|
||||
checkButtonAlt(rightThumbstickButton, SDL_CONTROLLER_BUTTON_RIGHTSTICK, 14)
|
||||
|
|
@ -204,7 +204,7 @@ s.d.ca.dir = (axis.value >= 0) ? AxisDir::Positive : AxisDir::Negative;
|
|||
#warning "This SDK doesn't support the detection of thumbstick buttons. You will not be able to rebind them from the menu on 10.14.1 or higher."
|
||||
#endif
|
||||
|
||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_15
|
||||
#if defined(__MAC_10_15) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_15
|
||||
// Requires macOS 10.15+
|
||||
checkButton(Menu, SDL_CONTROLLER_BUTTON_START, 15)
|
||||
checkButton(Options, SDL_CONTROLLER_BUTTON_BACK, 15)
|
||||
|
|
@ -212,7 +212,7 @@ s.d.ca.dir = (axis.value >= 0) ? AxisDir::Positive : AxisDir::Negative;
|
|||
#warning "This SDK doesn't support the detection of Start and Back buttons. You will not be able to rebind them from the menu on 10.15 or higher."
|
||||
#endif
|
||||
|
||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_11_0
|
||||
#if defined(__MAC_11_0) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_11_0
|
||||
// Requires macOS 11.0+
|
||||
checkButton(Home, SDL_CONTROLLER_BUTTON_GUIDE, 16)
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
|
|||
#ifdef MKXPZ_BUILD_XCODE
|
||||
#include <Availability.h>
|
||||
#include "TouchBar.h"
|
||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_15
|
||||
#if !defined(__MAC_10_15) || __MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_15
|
||||
#define MKXPZ_INIT_GL_LATER
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue