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

Fix build script osx #167

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix build script osx #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
602f6e2
Add virtualenv to requirements
altafan Jun 29, 2022
7096bba
Retrieve sdk-path instead of creating it
altafan Jun 29, 2022
91f02b1
Fix path for iphone and simulator
altafan Jul 4, 2022
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
4 changes: 1 addition & 3 deletions tools/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,7 @@ if [ \( "$(uname)" != "Darwin" \) -a \( "$BUILD" = "--gcc" \) ]; then
fi
if [ \( "$BUILD" = "--clang" \) ]; then
if [ \( "$(uname)" = "Darwin" \) ]; then
export XCODE_PATH=$(xcode-select --print-path 2>/dev/null)
export PLATFORM="MacOSX"
export SDK_PATH="$XCODE_PATH/Platforms/$PLATFORM.platform/Developer/SDKs/$PLATFORM.sdk"
export SDK_PATH=$(xcrun --show-sdk-path)
export SDK_CFLAGS="$SDK_CFLAGS -isysroot ${SDK_PATH} -mmacosx-version-min=10.13"
export SDK_LDFLAGS="$SDK_LDFLAGS -isysroot ${SDK_PATH} -mmacosx-version-min=10.13"
export CFLAGS="${SDK_CFLAGS} -O3"
Expand Down
6 changes: 2 additions & 4 deletions tools/ios_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
if test "x$1" == "x--iphone"; then
export IOS_PLATFORM=iPhoneOS
export ARCHS="-arch arm64"
export IOS_SDK_PATH=$(xcrun --sdk iphoneos --show-sdk-path)
else
export IOS_PLATFORM=iPhoneSimulator
export ARCHS="-arch x86_64"
export IOS_SDK_PATH=$(xcrun --sdk iphonesimulator --show-sdk-path)
fi

export XCODE_PATH=$(xcode-select --print-path 2>/dev/null)
export XCODE_DEFAULT_PATH="$XCODE_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin"
export XCODE_IOS_PATH="$XCODE_PATH/Platforms/$IOS_PLATFORM.platform/Developer/usr/bin"
export IOS_SDK_PATH="$XCODE_PATH/Platforms/$IOS_PLATFORM.platform/Developer/SDKs/$IOS_PLATFORM.sdk"

export SDK_CFLAGS_NO_ARCH="$q"
export SDK_CFLAGS="$SDK_CFLAGS $ARCHS"
Expand Down
1 change: 1 addition & 0 deletions tools/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
meson==0.58.0 --hash=sha256:f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd
virtualenv==20.15.1