diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-03-10 10:40:16 -0800 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-03-17 14:25:37 +0100 |
| commit | aed3869cfaf0f590f58265e203dd7b9a2ee38fb7 (patch) | |
| tree | d770c9136697c8ef55a2dd44ba8905a60a6f9791 /Makefile | |
| parent | 6379cb0cd78a47697b90211df767750847369f8e (diff) | |
| download | qtlocation-mapboxgl-aed3869cfaf0f590f58265e203dd7b9a2ee38fb7.tar.gz | |
[build] move ABI version awareness to mason.cmake
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -212,8 +212,7 @@ $(IOS_PROJ_PATH): $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings $(BUILD_DEP (cd $(IOS_OUTPUT_PATH) && cmake -G Xcode ../.. \ -DCMAKE_TOOLCHAIN_FILE=../../platform/ios/toolchain.cmake \ -DMBGL_PLATFORM=ios \ - -DMASON_PLATFORM=ios \ - -DMASON_PLATFORM_VERSION=8.0) + -DMASON_PLATFORM=ios) $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/ios/WorkspaceSettings.xcsettings mkdir -p "$(IOS_USER_DATA_PATH)" @@ -513,8 +512,7 @@ $(MBGL_ANDROID_BUILD_DIR)/build.ninja: $(MBGL_ANDROID_BUILD_DIR)/env.sh platform -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DMBGL_PLATFORM=android \ - -DMASON_PLATFORM=android \ - -DMASON_PLATFORM_VERSION=$1-$3) && \ + -DMASON_PLATFORM=android) && \ $$$${CMAKE} \ -H. \ -B"$(MBGL_ANDROID_BUILD_DIR)" |