summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-04-10 22:23:14 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-04-16 22:45:59 -0700
commitb8c39667ff7e6a7aeb74abb2469971304929def1 (patch)
treea3eac31a8f6487e67f6b301ef7ae583f9f90d92c /Makefile
parent1549b2b24908192238c2a7eb37dc1d0b25c1cb62 (diff)
downloadqtlocation-mapboxgl-b8c39667ff7e6a7aeb74abb2469971304929def1.tar.gz
[ios] Moved SDK from gyp into Xcode project
Added a new Cocoa Touch dynamic framework target and Cocoa Touch static library target to the main iOS Xcode project. The targets are based on the templates provided by Xcode. They contain headers and source files in the darwin/ and ios/ subdirectories. Headers are explicitly marked public or project-internal instead of implicitly by subdirectory. The SDK targets have a few dependencies that are managed by mason. Transform the config.gypi generated by configure into an .xcconfig file that Xcode uses to fill in compiler and linker flags. Removed the iossdk target from platform.gypi and pared down the platform-lib target. make iproj opens the overall Xcode workspace instead of just the core project. Resolved some warnings that are only now appearing because we’re using the standard warning and error flags instead of the pedantic and somewhat inappropriate flags that were forced by the gyp configuration files. Removed a console message informing developers of a long-ago deleted delegate method; the message was triggering a “selector not found” warning. Conditionalized some deprecated symbol usage that’s still needed for the static framework but not the dynamic framework, due to differing minimum deployment targets. Added a build phase to the static library target that copies headers for use with the static library itself. This would allow us to potentially include a header in the dynamic framework but not the static library and vice-versa. Updated the changelog to note that unused SVG files have been removed from the distribution.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b3db95d3d8..4a1f65a2b8 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ ios: $(IOS_PROJ_PATH)
-project $(IOS_PROJ_PATH) -target All build | xcpretty
iproj: $(IOS_PROJ_PATH)
- open $(IOS_PROJ_PATH)
+ open platform/ios/ios.xcworkspace
test-ios: ios
ios-sim start