Skip to content

disabled bitcode and automatic xCode / SDK detection #4

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

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

disabled bitcode and automatic xCode / SDK detection #4

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
8 changes: 3 additions & 5 deletions Config.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@ MARKETING_VERSION = 0.8.0
CURRENT_PROJECT_VERSION = 3


ARCHS = arm64 armv7 x86_64 x86_64h i386
EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64
EXCLUDED_ARCHS[sdk=macosx*] = i386
ARCHS = arm64 x86_64 x86_64h
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx

IPHONEOS_DEPLOYMENT_TARGET = 9.0
MACOSX_DEPLOYMENT_TARGET = 10.10
IPHONEOS_DEPLOYMENT_TARGET = 12.0
MACOSX_DEPLOYMENT_TARGET = 11.0

SWIFT_VERSION = 4.0
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# Usage: no parameters, settings mostly defined in xcode project
#

opts="SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES"
opts="SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO"

dd=./DerivedData
archivesPath="$dd/Archives"
Expand Down
15 changes: 12 additions & 3 deletions prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,15 @@
# - git clone of https://github.com/xiph/opus in directory ../opus
# - checked iosSDKVersion and osxSDKVersion

iosSDKVersion="14.4"
osxSDKVersion="11.1"
# Get the latest installed SDK versions automatically
iosSDKVersion=$(xcrun --sdk iphoneos --show-sdk-version)
osxSDKVersion=$(xcrun --sdk macosx --show-sdk-version)
opusDownload="https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz"
here=$(pwd)

mkdir opus-swift/libs
mkdir opus-swift/include

rm -f opus-*.gz
wget $opusDownload

Expand Down Expand Up @@ -86,7 +90,12 @@ generateLibopus()
lipo -i "$tmp/$product"
}

xcodePlatforms="/Applications/Xcode.app/Contents/Developer/Platforms"
# Check actual xCode path
xcodePath=$(xcode-select -p)

# Set the path to the platforms
xcodePlatforms="$xcodePath/Platforms"

sdkSimulator="$xcodePlatforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$iosSDKVersion.sdk"
sdkPhone="/$xcodePlatforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$iosSDKVersion.sdk"
sdkMac="/$xcodePlatforms/MacOSX.platform/Developer/SDKs/MacOSX$osxSDKVersion.sdk"
Expand Down