From 2e4ac4e39769397b5d8ba4db807d347717b81f20 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Wed, 16 Dec 2020 17:50:20 +0100 Subject: [PATCH] Adapting scripts and project files to the new directory structure --- .../MapboxGLAndroidSDK/src/cpp/CMakeLists.txt | 10 +- .../scripts/generate-style-code.js | 4 +- .../scripts/run-render-test.py | 2 +- mapbox-gl-native-ios/CMakeLists.txt | 4 +- mapbox-gl-native-ios/Makefile | 4 +- .../platform/darwin/darwin.xcconfig | 22 +-- .../ios/ios.xcodeproj/project.pbxproj | 151 +++++++++--------- .../macos/macos.xcodeproj/project.pbxproj | 6 +- 8 files changed, 103 insertions(+), 100 deletions(-) diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt index 15d8c1b0f..28a80e2c4 100644 --- a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt +++ b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10) -add_subdirectory(../../../vendor/mapbox-gl-native - ../../../vendor/mapbox-gl-native/${ANDROID_ABI}) +add_subdirectory(../../../../mapbox-gl-native + ../../../../mapbox-gl-native/${ANDROID_ABI}) target_compile_options(mbgl-compiler-options INTERFACE -frtti) @@ -188,9 +188,9 @@ add_library(mapbox-gl SHARED target_include_directories( mapbox-gl PRIVATE ${PROJECT_SOURCE_DIR} - ../../../vendor/mapbox-gl-native/src - ../../../vendor/mapbox-gl-native/platform/android/src - ../../../vendor/mapbox-gl-native/platform/default/include) + ../../../../mapbox-gl-native/src + ../../../../mapbox-gl-native/platform/android/src + ../../../../mapbox-gl-native/platform/default/include) target_compile_options(mapbox-gl PRIVATE $<$:-Oz> diff --git a/mapbox-gl-native-android/scripts/generate-style-code.js b/mapbox-gl-native-android/scripts/generate-style-code.js index cab7bca0d..1e4315265 100755 --- a/mapbox-gl-native-android/scripts/generate-style-code.js +++ b/mapbox-gl-native-android/scripts/generate-style-code.js @@ -3,7 +3,7 @@ const fs = require('fs'); const ejs = require('ejs'); -const spec = require('../vendor/mapbox-gl-native/scripts/style-spec'); +const spec = require('../../mapbox-gl-native/scripts/style-spec'); const _ = require('lodash'); // FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008 @@ -11,7 +11,7 @@ const _ = require('lodash'); //delete spec.layout_line["line-sort-key"] //delete spec.layout_fill["fill-sort-key"] -require('../vendor/mapbox-gl-native/scripts/style-code'); +require('../../mapbox-gl-native/scripts/style-code'); // Specification parsing // const lightProperties = Object.keys(spec[`light`]).reduce((memo, name) => { diff --git a/mapbox-gl-native-android/scripts/run-render-test.py b/mapbox-gl-native-android/scripts/run-render-test.py index 540dbed15..2bbf87d81 100644 --- a/mapbox-gl-native-android/scripts/run-render-test.py +++ b/mapbox-gl-native-android/scripts/run-render-test.py @@ -9,7 +9,7 @@ testCounter = 0 for cat in os.listdir(catPath): testPath = catPath + cat + "/" for test in os.listdir(testPath): - inputPath = os.getcwd() + "vendor/mapbox-gl-native/mapbox-gl-js/test/integration/render-tests/" + cat + "/" + test + inputPath = os.getcwd() + "../../mapbox-gl-native/mapbox-gl-js/test/integration/render-tests/" + cat + "/" + test outputPath = testPath + test expected = outputPath + "/expected.png" diff --git a/mapbox-gl-native-ios/CMakeLists.txt b/mapbox-gl-native-ios/CMakeLists.txt index 9947a5d48..7084a2891 100644 --- a/mapbox-gl-native-ios/CMakeLists.txt +++ b/mapbox-gl-native-ios/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.9) -add_subdirectory(./vendor/mapbox-gl-native/next) +message(source-dir=${CMAKE_SOURCE_DIR} current-dir=${CMAKE_CURRENT_SOURCE_DIR} current-binary-dir=${CMAKE_CURRENT_BINARY_DIR}) + +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../mapbox-gl-native ${CMAKE_CURRENT_BINARY_DIR}/mapbox-gl-native ) project (mbgl) \ No newline at end of file diff --git a/mapbox-gl-native-ios/Makefile b/mapbox-gl-native-ios/Makefile index ca36b4d41..b3e659a70 100644 --- a/mapbox-gl-native-ios/Makefile +++ b/mapbox-gl-native-ios/Makefile @@ -135,7 +135,7 @@ endif $(IOS_PROJ_PATH): $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings $(BUILD_DEPS) mkdir -p $(IOS_OUTPUT_PATH) - (cd $(IOS_OUTPUT_PATH) && $(CMAKE) -G Xcode ../../vendor/mapbox-gl-native \ + (cd $(IOS_OUTPUT_PATH) && $(CMAKE) -G Xcode ../../../mapbox-gl-native \ -DCMAKE_SYSTEM_NAME=iOS ) $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/ios/WorkspaceSettings.xcsettings @@ -240,7 +240,7 @@ endif $(MACOS_PROJ_PATH): $(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings $(BUILD_DEPS) mkdir -p $(MACOS_OUTPUT_PATH) - (cd $(MACOS_OUTPUT_PATH) && $(CMAKE) -G Xcode ../../vendor/mapbox-gl-native \ + (cd $(MACOS_OUTPUT_PATH) && $(CMAKE) -G Xcode ../../../mapbox-gl-native \ -DCMAKE_SYSTEM_NAME=Darwin ) $(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/macos/WorkspaceSettings.xcsettings diff --git a/mapbox-gl-native-ios/platform/darwin/darwin.xcconfig b/mapbox-gl-native-ios/platform/darwin/darwin.xcconfig index f87b68ef2..95315920a 100644 --- a/mapbox-gl-native-ios/platform/darwin/darwin.xcconfig +++ b/mapbox-gl-native-ios/platform/darwin/darwin.xcconfig @@ -58,17 +58,17 @@ GCC_WARN_UNUSED_VARIABLE = YES HEADER_SEARCH_PATHS = $(inherited) HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../platform/darwin/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/default/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/darwin/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/deps/variant/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/deps/geometry.hpp/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/deps/geojson.hpp/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/deps/optional" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/polylabel/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/darwin/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/deps/variant/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/deps/geometry.hpp/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/deps/geojson.hpp/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/deps/optional" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include" LD_GENERATE_MAP_FILE = YES diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.pbxproj b/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.pbxproj index 4451f7601..f741d029d 100644 --- a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.pbxproj +++ b/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.pbxproj @@ -821,7 +821,7 @@ 1F7454A61ED08AB400021D39 /* MGLLightTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLLightTest.mm; path = ../../darwin/test/MGLLightTest.mm; sourceTree = ""; }; 1F78399D235AA1E600D4D606 /* libmbgl-core.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libmbgl-core.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1F7839A3235E11FC00D4D606 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; - 1F7839A5235E137000D4D606 /* sideload_sat.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = sideload_sat.db; path = "../../vendor/mapbox-gl-native/test/fixtures/offline_database/sideload_sat.db"; sourceTree = ""; }; + 1F7839A5235E137000D4D606 /* sideload_sat.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = sideload_sat.db; path = "../../../mapbox-gl-native/test/fixtures/offline_database/sideload_sat.db"; sourceTree = ""; }; 1F8E8A80233A9FD9009B51ED /* MGLMapViewGestureRecognizerTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLMapViewGestureRecognizerTests.mm; sourceTree = ""; }; 1F95931C1E6DE2E900D5B294 /* MGLNSDateAdditionsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLNSDateAdditionsTests.mm; path = ../../darwin/test/MGLNSDateAdditionsTests.mm; sourceTree = ""; }; 1FC4817B2098CBC0000D09B4 /* NSPredicate+MGLPrivateAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSPredicate+MGLPrivateAdditions.h"; sourceTree = ""; }; @@ -1283,8 +1283,8 @@ DAC49C621CD07D74009E1AA3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = ""; }; DAC832642404AF9000A61BF8 /* darwin.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = darwin.xcconfig; path = ../darwin/darwin.xcconfig; sourceTree = ""; }; DAC832672404AFBB00A61BF8 /* ci.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = ci.xcconfig; path = ../darwin/ci.xcconfig; sourceTree = ""; }; - DAC8A47F24527EDB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../vendor/mapbox-gl-native/test/fixtures/resources/glyphs.pbf"; sourceTree = ""; }; - DAC8A4812452971B00C795BB /* mixed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = mixed.json; path = "../../../vendor/mapbox-gl-native/test/fixtures/local_glyphs/mixed.json"; sourceTree = ""; }; + DAC8A47F24527EDB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../../mapbox-gl-native/test/fixtures/resources/glyphs.pbf"; sourceTree = ""; }; + DAC8A4812452971B00C795BB /* mixed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = mixed.json; path = "../../../../mapbox-gl-native/test/fixtures/local_glyphs/mixed.json"; sourceTree = ""; }; DACA86242019218500E9693A /* MGLRasterDEMSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLRasterDEMSource.h; sourceTree = ""; }; DACA86252019218500E9693A /* MGLRasterDEMSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRasterDEMSource.mm; sourceTree = ""; }; DACBC60B20118ABE00C4D7E2 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = ""; }; @@ -3604,6 +3604,7 @@ CURRENT_PROJECT_VERSION = 15256; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_PREPROCESSOR_DEFINITIONS = ""; "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = ""; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -3638,18 +3639,18 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = GJZR2MEM28; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/polylabel/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/expected/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/expected/include", "$(PROJECT_DIR)/../../platform/darwin/include", ); INFOPLIST_FILE = benchmark/Info.plist; @@ -3689,18 +3690,18 @@ DEFINES_MODULE = YES; DYLIB_CURRENT_VERSION = 15256; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/polylabel/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", "$(PROJECT_DIR)/../../platform/darwin/include", ); LIBRARY_SEARCH_PATHS = ( @@ -4016,18 +4017,18 @@ DEFINES_MODULE = YES; DYLIB_CURRENT_VERSION = 15256; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/polylabel/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", "$(PROJECT_DIR)/../../platform/darwin/include", ); LIBRARY_SEARCH_PATHS = ( @@ -4056,18 +4057,18 @@ DEPLOYMENT_POSTPROCESSING = YES; DYLIB_CURRENT_VERSION = 15256; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/polylabel/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", "$(PROJECT_DIR)/../../platform/darwin/include", ); LIBRARY_SEARCH_PATHS = ( @@ -4095,18 +4096,18 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = GJZR2MEM28; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/polylabel/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/expected/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/expected/include", "$(PROJECT_DIR)/../../platform/darwin/include", ); INFOPLIST_FILE = benchmark/Info.plist; @@ -4122,18 +4123,18 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = GJZR2MEM28; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/polylabel/include", - "$(PROJECT_DIR)/../../vendor/mapbox-gl-native/vendor/expected/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", + "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/expected/include", "$(PROJECT_DIR)/../../platform/darwin/include", ); INFOPLIST_FILE = benchmark/Info.plist; diff --git a/mapbox-gl-native-ios/platform/macos/macos.xcodeproj/project.pbxproj b/mapbox-gl-native-ios/platform/macos/macos.xcodeproj/project.pbxproj index 4c4d5b3cf..b4810b1ad 100644 --- a/mapbox-gl-native-ios/platform/macos/macos.xcodeproj/project.pbxproj +++ b/mapbox-gl-native-ios/platform/macos/macos.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ 1F7454A11ECFB00300021D39 /* MGLLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLight.h; sourceTree = ""; }; 1F7454A21ECFB00300021D39 /* MGLLight.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLight.mm; sourceTree = ""; }; 1F7454AA1ED1DDBD00021D39 /* MGLLightTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLightTest.mm; sourceTree = ""; }; - 1F8A59F921653483004DFE75 /* sideload_sat.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = sideload_sat.db; path = "../../../vendor/mapbox-gl-native/test/fixtures/offline_database/sideload_sat.db"; sourceTree = ""; }; + 1F8A59F921653483004DFE75 /* sideload_sat.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = sideload_sat.db; path = "../../../../mapbox-gl-native/test/fixtures/offline_database/sideload_sat.db"; sourceTree = ""; }; 1F8A5A01216D4695004DFE75 /* MGLLoggingConfiguration_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLoggingConfiguration_Private.h; sourceTree = ""; }; 1F8A5A03216D4696004DFE75 /* MGLLoggingConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLoggingConfiguration.h; sourceTree = ""; }; 1F95931A1E6DE2B600D5B294 /* MGLNSDateAdditionsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLNSDateAdditionsTests.mm; path = ../../darwin/test/MGLNSDateAdditionsTests.mm; sourceTree = ""; }; @@ -617,8 +617,8 @@ DAC832652404AF9E00A61BF8 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../Makefile; sourceTree = ""; }; DAC832662404AFB400A61BF8 /* ci.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = ci.xcconfig; path = ../darwin/ci.xcconfig; sourceTree = ""; }; DAC832682404B26400A61BF8 /* jazzy.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = jazzy.yml; sourceTree = ""; }; - DAC8A47D24527EBB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../vendor/mapbox-gl-native/test/fixtures/resources/glyphs.pbf"; sourceTree = ""; }; - DAC8A4832452972F00C795BB /* mixed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = mixed.json; path = "../../../vendor/mapbox-gl-native/test/fixtures/local_glyphs/mixed.json"; sourceTree = ""; }; + DAC8A47D24527EBB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../../mapbox-gl-native/test/fixtures/resources/glyphs.pbf"; sourceTree = ""; }; + DAC8A4832452972F00C795BB /* mixed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = mixed.json; path = "../../../../mapbox-gl-native/test/fixtures/local_glyphs/mixed.json"; sourceTree = ""; }; DACA8620201920BE00E9693A /* MGLRasterDEMSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLRasterDEMSource.h; sourceTree = ""; }; DACA8621201920BE00E9693A /* MGLRasterDEMSource.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRasterDEMSource.mm; sourceTree = ""; }; DACB0C371E18DFFD005DDBEA /* MGLStyle+MBXAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MGLStyle+MBXAdditions.h"; sourceTree = ""; };