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.

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

Use correct Xcode toolchain to find bin tools #7481

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions scripts/package/package_xcode_and_sdks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Note: I wasn't able to rename the top folder when packaging, since it messed up symlinks (also the packages became unnecessarily bloated)

# Note 2: Due to the MacOS file resource links, packing using the built-in ´tar´ command is not advised.
# Instead, we recommend using ´gnu-tar`: https://formulae.brew.sh/formula/gnu-tar
# Instead, we recommend using ´gnu-tar`: https://formulae.brew.sh/formula/gnu-tar (use with TAR=gtar)

# You can unpack the tar files and prettify them in one go
# $ mkdir iPhoneOS12.1.sdk && tar xf ../new_packages/iPhoneOS12.1.sdk.tar.gz -C iPhoneOS12.1.sdk --strip-components 1
Expand All @@ -33,6 +33,12 @@ XCODE="/Applications/Xcode.app/Contents/Developer/Toolchains"

VERBOSE=

if [ -z "$TAR" ]; then
TAR=$(which tar)
fi

echo "Using TAR=${TAR}"

if [ ! -d "$TARGET_DIR" ]; then
mkdir -p "$TARGET_DIR"
fi
Expand All @@ -54,8 +60,8 @@ function make_archive() {
fi

echo EXTRA ARGS: $@
echo tar ${tarflags} $@ -f ${archive} ${src}
tar ${tarflags} $@ -f ${archive} ${src}
echo ${TAR} ${tarflags} $@ -f ${archive} ${src}
${TAR} ${tarflags} $@ -f ${archive} ${src}
else
echo "Found existing $archive"
fi
Expand Down
3 changes: 3 additions & 0 deletions share/extender/build_input.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ platforms:
MACOS_VERSION_MIN: "{{env.MACOS_VERSION_MIN}}"
SWIFT_VERSION: "{{env.SWIFT_5_5_VERSION}}"
SYSROOT: "{{env.PLATFORMSDK_DIR}}/MacOSX{{env.MACOS_13_VERSION}}.sdk"
PATH: "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_14_VERSION}}.xctoolchain/usr/bin:{{env.PATH}}"
context:
frameworks: ["Foundation", "AppKit", "Cocoa", "OpenGL", "OpenAL", "AGL", "IOKit", "Carbon", "CoreVideo", "QuartzCore"]
engineLibs: ["engine", "engine_service", "mbedtls", "zip", "webviewext", "profile", "remotery", "profilerext", "facebookext", "iapext", "pushext", "iacext", "record", "gameobject", "ddf", "resource", "gamesys", "graphics", "graphics_transcoder_basisu", "basis_transcoder", "physics", "BulletDynamics", "BulletCollision", "LinearMath", "Box2D", "render", "script", "luajit-5.1", "extension", "hid", "input", "particle", "rig", "dlib", "dmglfw", "gui", "crashext", "sound", "tremolo", "vpx", "liveupdate"]
Expand Down Expand Up @@ -171,6 +172,7 @@ platforms:
IOS_VERSION: "{{env.IOS_16_VERSION}}"
IOS_VERSION_MIN: "{{env.IOS_VERSION_MIN}}"
SYSROOT: "{{env.PLATFORMSDK_DIR}}/iPhoneOS{{env.IOS_16_VERSION}}.sdk"
PATH: "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_14_VERSION}}.xctoolchain/usr/bin:{{env.PATH}}"
context:
frameworks: ["OpenGLES", "OpenAL", "QuartzCore", "CoreGraphics", "AudioToolbox", "SystemConfiguration", "CoreVideo", "UIKit", "AVFoundation"]
weakFrameworks: ["Foundation"]
Expand Down Expand Up @@ -215,6 +217,7 @@ platforms:
IOS_VERSION: "{{env.IOS_16_VERSION}}"
IOS_VERSION_MIN: "{{env.IOS_VERSION_MIN}}"
SYSROOT: "{{env.PLATFORMSDK_DIR}}/iPhoneSimulator{{env.IOS_16_VERSION}}.sdk"
PATH: "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_14_VERSION}}.xctoolchain/usr/bin:{{env.PATH}}"
context:
frameworks: ["OpenGLES", "OpenAL", "QuartzCore", "CoreGraphics", "AudioToolbox", "SystemConfiguration", "CoreVideo", "UIKit", "AVFoundation"]
weakFrameworks: ["Foundation"]
Expand Down