This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[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.
- Loading branch information
Showing
33 changed files
with
348 additions
and
327 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| { | ||
| 'includes': [ | ||
| '../ios/app/mapboxgl-app.gypi', | ||
| '../ios/framework/framework-ios.gypi', | ||
| '../ios/benchmark/benchmark-ios.gypi', | ||
| ], | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #import <Foundation/Foundation.h> | ||
|
|
||
| /// Project version number for Mapbox. | ||
| FOUNDATION_EXPORT double MapboxVersionNumber; | ||
|
|
||
| /// Project version string for Mapbox. | ||
| FOUNDATION_EXPORT const unsigned char MapboxVersionString[]; | ||
|
|
||
| #import <Mapbox/MGLAccountManager.h> | ||
| #import <Mapbox/MGLAnnotation.h> | ||
| #import <Mapbox/MGLAnnotationImage.h> | ||
| #import <Mapbox/MGLCalloutView.h> | ||
| #import <Mapbox/MGLMapCamera.h> | ||
| #import <Mapbox/MGLGeometry.h> | ||
| #import <Mapbox/MGLMapView.h> | ||
| #import <Mapbox/MGLMapView+IBAdditions.h> | ||
| #import <Mapbox/MGLMapView+MGLCustomStyleLayerAdditions.h> | ||
| #import <Mapbox/MGLMultiPoint.h> | ||
| #import <Mapbox/MGLOverlay.h> | ||
| #import <Mapbox/MGLPointAnnotation.h> | ||
| #import <Mapbox/MGLPolygon.h> | ||
| #import <Mapbox/MGLPolyline.h> | ||
| #import <Mapbox/MGLShape.h> | ||
| #import <Mapbox/MGLStyle.h> | ||
| #import <Mapbox/MGLTypes.h> | ||
| #import <Mapbox/MGLUserLocation.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #import <Mapbox/Mapbox.h> | ||
|
|
||
| #import "../../platform/ios/src/NSBundle+MGLAdditions.h" | ||
| #import "../../platform/ios/src/NSProcessInfo+MGLAdditions.h" | ||
| #import "../../platform/darwin/NSString+MGLAdditions.h" | ||
|
|
||
| __attribute__((constructor)) | ||
| static void InitializeMapbox() { | ||
| static int initialized = 0; | ||
| if (initialized) { | ||
| return; | ||
| } | ||
|
|
||
| mgl_linkBundleCategory(); | ||
| mgl_linkStringCategory(); | ||
| mgl_linkProcessInfoCategory(); | ||
|
|
||
| [MGLAccountManager class]; | ||
| [MGLAnnotationImage class]; | ||
| [MGLMapCamera class]; | ||
| [MGLMapView class]; | ||
| [MGLMultiPoint class]; | ||
| [MGLPointAnnotation class]; | ||
| [MGLPolygon class]; | ||
| [MGLPolyline class]; | ||
| [MGLShape class]; | ||
| [MGLStyle class]; | ||
| [MGLUserLocation class]; | ||
| } |
Oops, something went wrong.