Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quickfix x86 builds #2129

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Quickfix x86 builds #2129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions iSH.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

/* Begin PBXBuildFile section */
0FC2383C2991FBA6004C09EC /* mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 0FC2383B2991FB82004C09EC /* mmx.c */; };
1D409DEF2A2D4A6800E08219 /* libfakefs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BB21A16F2689041500BD19B4 /* libfakefs.a */; };
491B31E62883BF22008EEFB0 /* ThemeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 491B31E52883BF22008EEFB0 /* ThemeViewController.m */; };
49302D8E277669D300C9885A /* ish.c in Sources */ = {isa = PBXBuildFile; fileRef = 49302D8D277669D300C9885A /* ish.c */; };
496C7AB227CC697E005D7613 /* Theme.m in Sources */ = {isa = PBXBuildFile; fileRef = 491C4C1E27C8FB65008B1DFA /* Theme.m */; };
Expand Down Expand Up @@ -746,6 +747,7 @@
files = (
497F6D87254E62E100C82F46 /* libish.a in Frameworks */,
BBFB2C7E259026C200545EAB /* libish_emu.a in Frameworks */,
1D409DEF2A2D4A6800E08219 /* libfakefs.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
9 changes: 9 additions & 0 deletions xcode-meson.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,18 @@ if [[ $? -ne 0 ]]; then
export CC_FOR_BUILD="env -u SDKROOT -u IPHONEOS_DEPLOYMENT_TARGET xcrun clang"
export CC="$CC_FOR_BUILD" # compatibility with meson < 0.54.0
crossfile=cross.txt

# We need to reset archs to compensate for problematic universal builds showing up
# for certain targets.
# NOTE for x86: arm64 needs to be set in EXCLUDED_ARCHS
if [[ "$ARCHS" == *"x86"* ]]; then
ARCHS="x86_64"
fi

for arch in $ARCHS; do
arch_args="'-arch', '$arch', $arch_args"
done

arch_args="${arch_args%%, }"
meson_arch=${ARCHS%% *}
case "$meson_arch" in
Expand Down