From 9350d3f78cee508f98bbae8d31a3a47007cb0322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Thu, 3 Dec 2015 16:03:00 -0800 Subject: [ios] Converted iOS SDK into dynamic framework make iproj now produces a target that pulls together static libraries like core and platform-ios into a real dynamic framework. iosapp is pretty much just a regular iOS application that links Mapbox.framework (except for the inclusion of default_styles.hpp). iosapp runs fine in the Simulator and on a device, and the same is true for any application linking against Mapbox.framework. The ipackage target produces both a Bitcode-disabled static framework and a Bitcode-enabled dynamic framework, eliminating the need for a separate framework.sh. It disables code signing, since that happens on copy when the framework is embedded inside the application bundle. It also merges the device and simulator builds into a single fat framework. Also bumped itest minimum deployment target to iOS 8.0, the first version that supports linking frameworks. Fixes #828. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a9c6666eca..c0d72ed04f 100644 --- a/Makefile +++ b/Makefile @@ -48,12 +48,10 @@ isim: ; $(RUN) HOST=ios Xcode/iosapp ibench: export XCODEBUILD_ARGS += -sdk iphoneos ARCHS="arm64" ibench: ; $(RUN) HOST=ios Xcode/ios-bench -.PHONY: ipackage ipackage-strip ipackage-sim ipackage-no-bitcode itest +.PHONY: ipackage ipackage-strip ipackage-sim itest ipackage: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh ipackage-strip: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh strip ipackage-sim: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh sim -ipackage-no-bitcode: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh no-bitcode -iframework: ipackage-strip ; ./platform/ios/scripts/framework.sh itest: ipackage-sim ; ./platform/ios/scripts/test.sh .PHONY: xpackage xpackage-strip xctest -- cgit v1.2.1