tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapting scripts and project files to the new directory structure

Browse Source
This commit is contained in:
Petr Pokorny
2020-12-16 17:50:20 +01:00
parent d7c358771e
commit 2e4ac4e397
8 changed files with 103 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt
View File

@@ -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 $<$<CONFIG:Release>:-Oz>

4
mapbox-gl-native-android/scripts/generate-style-code.js
View File

@@ -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) => {

2
mapbox-gl-native-android/scripts/run-render-test.py
View File

@@ -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"

4
mapbox-gl-native-ios/CMakeLists.txt
View File

@@ -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)

4
mapbox-gl-native-ios/Makefile
View File

@@ -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

22
mapbox-gl-native-ios/platform/darwin/darwin.xcconfig
View File

@@ -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

151
mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.pbxproj
View File

@@ -821,7 +821,7 @@
1F7454A61ED08AB400021D39 /* MGLLightTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLLightTest.mm; path = ../../darwin/test/MGLLightTest.mm; sourceTree = "<group>"; };
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 = "<group>"; };
1F7839A5235E137000D4D606 /* sideload_sat.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = sideload_sat.db; path = "../../../mapbox-gl-native/test/fixtures/offline_database/sideload_sat.db"; sourceTree = "<group>"; };
1F8E8A80233A9FD9009B51ED /* MGLMapViewGestureRecognizerTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLMapViewGestureRecognizerTests.mm; sourceTree = "<group>"; };
1F95931C1E6DE2E900D5B294 /* MGLNSDateAdditionsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLNSDateAdditionsTests.mm; path = ../../darwin/test/MGLNSDateAdditionsTests.mm; sourceTree = "<group>"; };
1FC4817B2098CBC0000D09B4 /* NSPredicate+MGLPrivateAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSPredicate+MGLPrivateAdditions.h"; sourceTree = "<group>"; };
@@ -1283,8 +1283,8 @@
DAC49C621CD07D74009E1AA3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
DAC832642404AF9000A61BF8 /* darwin.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = darwin.xcconfig; path = ../darwin/darwin.xcconfig; sourceTree = "<group>"; };
DAC832672404AFBB00A61BF8 /* ci.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = ci.xcconfig; path = ../darwin/ci.xcconfig; sourceTree = "<group>"; };
DAC8A47F24527EDB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../vendor/mapbox-gl-native/test/fixtures/resources/glyphs.pbf"; sourceTree = "<group>"; };
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 = "<group>"; };
DAC8A47F24527EDB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../../mapbox-gl-native/test/fixtures/resources/glyphs.pbf"; sourceTree = "<group>"; };
DAC8A4812452971B00C795BB /* mixed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = mixed.json; path = "../../../../mapbox-gl-native/test/fixtures/local_glyphs/mixed.json"; sourceTree = "<group>"; };
DACA86242019218500E9693A /* MGLRasterDEMSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLRasterDEMSource.h; sourceTree = "<group>"; };
DACA86252019218500E9693A /* MGLRasterDEMSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRasterDEMSource.mm; sourceTree = "<group>"; };
DACBC60B20118ABE00C4D7E2 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -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;

6
mapbox-gl-native-ios/platform/macos/macos.xcodeproj/project.pbxproj
View File

@@ -354,7 +354,7 @@
1F7454A11ECFB00300021D39 /* MGLLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLight.h; sourceTree = "<group>"; };
1F7454A21ECFB00300021D39 /* MGLLight.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLight.mm; sourceTree = "<group>"; };
1F7454AA1ED1DDBD00021D39 /* MGLLightTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLightTest.mm; sourceTree = "<group>"; };
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 = "<group>"; };
1F8A59F921653483004DFE75 /* sideload_sat.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = sideload_sat.db; path = "../../../../mapbox-gl-native/test/fixtures/offline_database/sideload_sat.db"; sourceTree = "<group>"; };
1F8A5A01216D4695004DFE75 /* MGLLoggingConfiguration_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLoggingConfiguration_Private.h; sourceTree = "<group>"; };
1F8A5A03216D4696004DFE75 /* MGLLoggingConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLoggingConfiguration.h; sourceTree = "<group>"; };
1F95931A1E6DE2B600D5B294 /* MGLNSDateAdditionsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLNSDateAdditionsTests.mm; path = ../../darwin/test/MGLNSDateAdditionsTests.mm; sourceTree = "<group>"; };
@@ -617,8 +617,8 @@
DAC832652404AF9E00A61BF8 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../Makefile; sourceTree = "<group>"; };
DAC832662404AFB400A61BF8 /* ci.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = ci.xcconfig; path = ../darwin/ci.xcconfig; sourceTree = "<group>"; };
DAC832682404B26400A61BF8 /* jazzy.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = jazzy.yml; sourceTree = "<group>"; };
DAC8A47D24527EBB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../vendor/mapbox-gl-native/test/fixtures/resources/glyphs.pbf"; sourceTree = "<group>"; };
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 = "<group>"; };
DAC8A47D24527EBB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../../mapbox-gl-native/test/fixtures/resources/glyphs.pbf"; sourceTree = "<group>"; };
DAC8A4832452972F00C795BB /* mixed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = mixed.json; path = "../../../../mapbox-gl-native/test/fixtures/local_glyphs/mixed.json"; sourceTree = "<group>"; };
DACA8620201920BE00E9693A /* MGLRasterDEMSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLRasterDEMSource.h; sourceTree = "<group>"; };
DACA8621201920BE00E9693A /* MGLRasterDEMSource.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRasterDEMSource.mm; sourceTree = "<group>"; };
DACB0C371E18DFFD005DDBEA /* MGLStyle+MBXAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MGLStyle+MBXAdditions.h"; sourceTree = "<group>"; };