diff --git a/3party/fast_double_parser b/3party/fast_double_parser index efec03532e..111ad80417 160000 --- a/3party/fast_double_parser +++ b/3party/fast_double_parser @@ -1 +1 @@ -Subproject commit efec03532ef65984786e5e32dbc81f6e6a55a115 +Subproject commit 111ad8041765d1623195bd6eb8b6bc7d97c44507 diff --git a/3party/jansson/CMakeLists.txt b/3party/jansson/CMakeLists.txt new file mode 100644 index 0000000000..c5fb507275 --- /dev/null +++ b/3party/jansson/CMakeLists.txt @@ -0,0 +1,17 @@ +set(JANSSON_EXAMPLES OFF) +set(JANSSON_BUILD_DOCS OFF) +set(JANSSON_WITHOUT_TESTS OFF) +set(JANSSON_INSTALL OFF) + +add_subdirectory(jansson) + +target_sources(jansson + PRIVATE + jansson_handle.cpp + myjansson.cpp + PUBLIC + jansson_handle.hpp + myjansson.hpp +) + +target_include_directories(jansson PUBLIC jansson/src .) diff --git a/cppjansson/jansson_handle.cpp b/3party/jansson/jansson_handle.cpp similarity index 100% rename from cppjansson/jansson_handle.cpp rename to 3party/jansson/jansson_handle.cpp diff --git a/cppjansson/jansson_handle.hpp b/3party/jansson/jansson_handle.hpp similarity index 100% rename from cppjansson/jansson_handle.hpp rename to 3party/jansson/jansson_handle.hpp diff --git a/cppjansson/cppjansson.cpp b/3party/jansson/myjansson.cpp similarity index 98% rename from cppjansson/cppjansson.cpp rename to 3party/jansson/myjansson.cpp index bf61be32cc..5798ee7bd0 100644 --- a/cppjansson/cppjansson.cpp +++ b/3party/jansson/myjansson.cpp @@ -1,4 +1,4 @@ -#include "cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include diff --git a/cppjansson/cppjansson.hpp b/3party/jansson/myjansson.hpp similarity index 100% rename from cppjansson/cppjansson.hpp rename to 3party/jansson/myjansson.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index e0ccabc457..9ae6a1c271 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -322,16 +322,7 @@ else() add_subdirectory(3party/freetype) add_subdirectory(3party/icu) endif() - -set(JANSSON_EXAMPLES OFF) -set(JANSSON_BUILD_DOCS OFF) -set(JANSSON_WITHOUT_TESTS ON) -set(JANSSON_INSTALL OFF) -find_package_or_fallback_to_3party(Jansson 2.14.0 3party/jansson/jansson/) -if (NOT Jansson_FOUND) - include_directories("${PROJECT_BINARY_DIR}/3party/jansson/jansson/include") -endif() - +add_subdirectory(3party/jansson) add_subdirectory(3party/liboauthcpp) add_subdirectory(3party/minizip) add_subdirectory(3party/opening_hours) @@ -365,7 +356,6 @@ add_subdirectory(geometry) add_subdirectory(indexer) add_subdirectory(kml) add_subdirectory(map) -add_subdirectory(cppjansson) add_subdirectory(platform) add_subdirectory(routing) add_subdirectory(routing_common) diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt index c4cc9d4799..0f63b4a5d4 100644 --- a/android/jni/CMakeLists.txt +++ b/android/jni/CMakeLists.txt @@ -103,7 +103,7 @@ target_link_libraries(${PROJECT_NAME} # expat # freetype # minizip - # cppjansson + # jansson # protobuf # succinct # stb_image diff --git a/android/res/values/strings-tts.xml b/android/res/values/strings-tts.xml index 644cc050c2..0b93f980a6 100644 --- a/android/res/values/strings-tts.xml +++ b/android/res/values/strings-tts.xml @@ -13,65 +13,55 @@ Otherwise we consider that this is zh-Hans. TODO: Move language list to core. - - languages should be added alphabetically in tts_language_names --> en - id + ru ca + cs da de es - eu fr - hr + id it - sw hu nl - nb pl pt ro - sv + sk fi sv vi tr - cs el - be - ru uk ar fa - mr hi - th - zh-CN:zh-Hans - zh-TW:zh-Hant ja ko + th + zh-TW:zh-Hant + zh-CN:zh-Hans English - Bahasa Indonesia + Русский Català + Čeština Dansk Deutsch Español - Euskara Français - Hrvatski + Indonesia Italiano - Kiswahili Magyar Nederlands - Norsk Bokmål Polski Português Română @@ -80,19 +70,15 @@ Svenska Tiếng Việt Türkçe - Čeština Ελληνικά - Беларуская - Русский Українська العربية فارسی - मराठी - हिन्दी - ไทย - 中文简体 - 中文繁體 + हिंदी 日本語 한국어 + ภาษาไทย + 中文繁體 + 中文简体 diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index a4f7117661..27374e9784 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -2,6 +2,7 @@ project(base) set(SRC # Our code will be recompiled on modification of these headers. + ../3party/fast_double_parser/include/fast_double_parser.h ../std/boost_container_hash.hpp ../std/target_os.hpp ../std/windows.hpp @@ -109,6 +110,4 @@ set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) target_link_libraries(${PROJECT_NAME} INTERFACE Threads::Threads) -target_include_directories(${PROJECT_NAME} PRIVATE "${OMIM_ROOT}/3party/fast_double_parser/include") - omim_add_test_subdirectory(base_tests) diff --git a/base/string_utils.cpp b/base/string_utils.cpp index 0d0a2025b3..420c938760 100644 --- a/base/string_utils.cpp +++ b/base/string_utils.cpp @@ -2,6 +2,8 @@ #include "base/assert.hpp" +#include "3party/fast_double_parser/include/fast_double_parser.h" + #include #include #include @@ -9,7 +11,6 @@ #include #include -#include namespace strings { diff --git a/cmake/FindJansson.cmake b/cmake/FindJansson.cmake deleted file mode 100644 index 0ab31cd267..0000000000 --- a/cmake/FindJansson.cmake +++ /dev/null @@ -1,14 +0,0 @@ -if (Jansson_INCLUDE_DIRS AND Jansson_LIBRARY AND Jansson_VERSION) - set(Jansson_FOUND TRUE) -else () - find_path(Jansson_INCLUDE_DIRS NAMES jansson.h) - find_library(Jansson_LIBRARY NAMES jansson) - - if (Jansson_INCLUDE_DIRS AND Jansson_LIBRARY) - set(regex_jansson_version "#define[ \t]+JANSSON_VERSION[ \t]+[\"]([^\"]+)[\"]") - file(STRINGS "${Jansson_INCLUDE_DIRS}/jansson.h" Jansson_VERSION REGEX "${regex_jansson_version}") - string(REGEX REPLACE "${regex_jansson_version}" "\\1" Jansson_VERSION "${Jansson_VERSION}") - unset(regex_jansson_version) - set(Jansson_FOUND TRUE) - endif () -endif() diff --git a/coding/CMakeLists.txt b/coding/CMakeLists.txt index b4d945351e..7a43455fbf 100644 --- a/coding/CMakeLists.txt +++ b/coding/CMakeLists.txt @@ -96,7 +96,7 @@ omim_add_library(${PROJECT_NAME} ${SRC}) target_link_libraries(${PROJECT_NAME} base expat - cppjansson + jansson succinct ICU::uc ICU::i18n # For transliteration. diff --git a/coding/serdes_json.hpp b/coding/serdes_json.hpp index d14d926a20..fc3d063b31 100644 --- a/coding/serdes_json.hpp +++ b/coding/serdes_json.hpp @@ -6,7 +6,7 @@ #include "base/exception.hpp" #include "base/scope_guard.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include diff --git a/cppjansson/CMakeLists.txt b/cppjansson/CMakeLists.txt deleted file mode 100644 index 7fc9b37fa0..0000000000 --- a/cppjansson/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -project(cppjansson) -set(SRC - jansson_handle.cpp - cppjansson.cpp - jansson_handle.hpp - cppjansson.hpp -) -omim_add_library(${PROJECT_NAME} ${SRC}) -target_link_libraries(${PROJECT_NAME} - jansson -) diff --git a/data/categories.txt b/data/categories.txt index 574a53c5de..b8ef3989e5 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -10272,7 +10272,7 @@ cs:Nabíjecí stanice|nabíjení da:Ladestation|opladning nl:Oplaadstation|opladen fi:Latausasema|lataus -fr:3Borne de recharge|4station de recharge|4voiture électrique|recharge +fr:Station de recharge|Recharge de:4Ladestation|aufladen hu:Töltőállomás|töltés id:Pusat Pengisian Daya|pengisian daya @@ -14400,20 +14400,3 @@ uk:Оптовий магазин vi:Cửa hàng bán buôn zh-Hans:批发店 zh-Hant:批髮店 - -area:leisure-track|leisure-track -en:Track -de:Laufbahn -es:Pista deportiva -et:Jooksurada -fr:Piste de course -it:Pista da corsa -ja:トラック -mr:ट्रॅक -nl:Parcours -pt:Pista para desportos não motorizados -pt-BR:Pista para esportes não motorizados -ru:Беговая дорожка -tr:Pist -uk:Бігова доріжка -zh-Hans = 賽道 diff --git a/data/editor.config b/data/editor.config index 045f987e90..17ecb45184 100644 --- a/data/editor.config +++ b/data/editor.config @@ -280,11 +280,6 @@ - - - - - diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index ccc121ca96..fddb870060 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index aadf7d11c9..4b8677c9d9 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index 8216f33c89..a918ed2655 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 418933629b..5ffbc8d724 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index 3c7a0c63ee..693e526a83 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index e1cee249d8..51d5ef0144 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index fa83b8ac3b..fb3a740d24 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 11d97bd3f4..acc1b58786 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index 58266dcd1b..76e140b531 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index 4499d10c9e..5f29d79513 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index 865bcadcc6..3617f77631 100644 Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index 4868d1a32b..eaf7427dc2 100644 Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ diff --git a/data/strings/sound.txt b/data/strings/sound.txt index 7731f0e0b9..a753a1fbc6 100644 --- a/data/strings/sound.txt +++ b/data/strings/sound.txt @@ -415,8 +415,8 @@ nb = Ta avkjøringen. nl = Verlaat. pl = Zjazd. - pt = Saia. - pt-BR = Saia. + pt = Saída. + pt-BR = Saída. ro = Ieșire. ru = Съезд. sk = Výjazd. @@ -454,8 +454,8 @@ nb = Du ankommer. nl = Arriveert u. pl = Dojedziesz. - pt = Chegará ao seu destino. - pt-BR = Você chegará ao seu destino. + pt = Está a chegar ao seu destino. + pt-BR = Você está chegando ao seu destino. ro = Veți sosi. ru = Вы прибудете в пункт назначения. sk = Dorazíte. @@ -493,8 +493,8 @@ nb = Du har ankommet. nl = Bestemming bereikt. pl = Jesteś u celu. - pt = Chegou ao seu destino. - pt-BR = Você chegou ao seu destino. + pt = Chegou no seu destino. + pt-BR = Você chegou no seu destino. ro = Ați ajuns. ru = Вы прибыли в пункт назначения. sk = Dorazili ste do cieľa. diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index c0210bc644..b0e540e84a 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -1026,7 +1026,7 @@ eu = Kargatzeko geltokia fa = ایستگاه شارژ fi = Latausasema - fr = Borne de recharge + fr = Station de recharge hu = Töltő állomás id = Pusat Pengisian Daya it = Stazione di ricarica @@ -1049,9 +1049,6 @@ zh-Hans = 充电站 zh-Hant = 充電站 - [type.amenity.charging_station.motorcar] - ref = type.amenity.charging_station - [type.amenity.childcare] en = Nursery ar = حضانة @@ -13806,9 +13803,6 @@ uk = Бігова доріжка zh-Hans = 賽道 - [type.leisure.track.area] - ref = type.leisure.track - [type.leisure.water_park] en = Water Park ar = ملاهي مائية diff --git a/data/styles/clear/style-clear/symbols/subway-buenosaires-m.svg b/data/styles/clear/style-clear/symbols/subway-buenosaires-m.svg index 72f7d1a5e0..ba40922c87 100644 --- a/data/styles/clear/style-clear/symbols/subway-buenosaires-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-buenosaires-m.svg @@ -1,5 +1,11 @@ - - - - + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-buenosaires-s.svg b/data/styles/clear/style-clear/symbols/subway-buenosaires-s.svg index 80458e94ab..4eadd3f16f 100644 --- a/data/styles/clear/style-clear/symbols/subway-buenosaires-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-buenosaires-s.svg @@ -1,5 +1,11 @@ - - - - + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-buenosaires-m.svg b/data/styles/clear/style-night/symbols/subway-buenosaires-m.svg index 1621ad1723..34d97573b4 100644 --- a/data/styles/clear/style-night/symbols/subway-buenosaires-m.svg +++ b/data/styles/clear/style-night/symbols/subway-buenosaires-m.svg @@ -1,5 +1,11 @@ - - - - + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-buenosaires-s.svg b/data/styles/clear/style-night/symbols/subway-buenosaires-s.svg index 754a22accf..8c813cb28d 100644 --- a/data/styles/clear/style-night/symbols/subway-buenosaires-s.svg +++ b/data/styles/clear/style-night/symbols/subway-buenosaires-s.svg @@ -1,5 +1,11 @@ - - - - + + + + + + + + + + diff --git a/drape_frontend/color_constants.cpp b/drape_frontend/color_constants.cpp index 9f11d07532..630d735df2 100644 --- a/drape_frontend/color_constants.cpp +++ b/drape_frontend/color_constants.cpp @@ -11,7 +11,7 @@ #include "base/assert.hpp" #include "base/string_utils.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index 5a6aa4354b..881dfa2206 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt @@ -248,7 +248,7 @@ target_link_libraries(${PROJECT_NAME} storage descriptions indexer - cppjansson + jansson expat tess2 $<$:${CMAKE_DL_LIBS}> # dladdr from boost::stacktrace diff --git a/generator/brands_loader.cpp b/generator/brands_loader.cpp index 43be651e35..4ebc41fe22 100644 --- a/generator/brands_loader.cpp +++ b/generator/brands_loader.cpp @@ -8,7 +8,7 @@ #include "base/logging.hpp" #include "base/string_utils.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include diff --git a/generator/filter_elements.hpp b/generator/filter_elements.hpp index 6fefb387c8..e906af2a60 100644 --- a/generator/filter_elements.hpp +++ b/generator/filter_elements.hpp @@ -43,7 +43,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace generator { diff --git a/generator/hierarchy_entry.cpp b/generator/hierarchy_entry.cpp index cd150d2d2e..23cf49064d 100644 --- a/generator/hierarchy_entry.cpp +++ b/generator/hierarchy_entry.cpp @@ -14,7 +14,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace { diff --git a/generator/pygen/CMakeLists.txt b/generator/pygen/CMakeLists.txt index d8142a7fc9..4f26910972 100644 --- a/generator/pygen/CMakeLists.txt +++ b/generator/pygen/CMakeLists.txt @@ -30,7 +30,7 @@ omim_link_libraries( freetype expat ICU::i18n - cppjansson + jansson protobuf bsdiff minizip diff --git a/generator/region_meta.cpp b/generator/region_meta.cpp index 96a4d0f5f7..d1863a9efc 100644 --- a/generator/region_meta.cpp +++ b/generator/region_meta.cpp @@ -4,7 +4,7 @@ #include "platform/platform.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp index 9f61d8afe5..af78c34b2f 100644 --- a/indexer/editable_map_object.cpp +++ b/indexer/editable_map_object.cpp @@ -745,7 +745,7 @@ bool EditableMapObject::ValidateName(string const & name) if (strings::IsASCIIString(name)) { - static auto const s_nameRegex = regex(R"(^[ A-Za-z0-9.,?!@°#$%&()\-\+\/\\\[\]:;"'`]+$)"); + static auto const s_nameRegex = regex(R"(^[ A-Za-z0-9.,?!@#$%&()\-\+:;"'`]+$)"); return regex_match(name, s_nameRegex); } @@ -762,7 +762,7 @@ bool EditableMapObject::ValidateName(string const & name) return false; } - std::u32string const excludedSymbols = U"^~§><{}*=_±\n\t\r\v\f|√•÷׶"; + std::u32string const excludedSymbols = U"^~§><{}[]*=_±\n\t\r\v\f|√•÷׶°"; for (auto const ch : u32name) { diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index 4878a414cf..916a86d38e 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -54,7 +54,6 @@ public: m_map[c.GetTypeByPath({"highway", "service"})] = ftypes::HighwayClass::Service; m_map[c.GetTypeByPath({"highway", "track"})] = ftypes::HighwayClass::Service; - m_map[c.GetTypeByPath({"highway", "busway"})] = ftypes::HighwayClass::Service; m_map[c.GetTypeByPath({"man_made", "pier"})] = ftypes::HighwayClass::Service; m_map[c.GetTypeByPath({"highway", "pedestrian"})] = ftypes::HighwayClass::Pedestrian; @@ -145,10 +144,9 @@ bool BaseChecker::IsMatched(uint32_t type) const return (find(m_types.begin(), m_types.end(), PrepareToMatch(type, m_level)) != m_types.end()); } -void BaseChecker::ForEachType(function const & fn) const +void BaseChecker::ForEachType(function && fn) const { - for (auto const & t : m_types) - fn(t); + for_each(m_types.cbegin(), m_types.cend(), move(fn)); } bool BaseChecker::operator()(feature::TypesHolder const & types) const diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp index 6a47e28e15..30b3e1ec9f 100644 --- a/indexer/ftypes_matcher.hpp +++ b/indexer/ftypes_matcher.hpp @@ -9,8 +9,10 @@ #include #include #include +#include #include #include +#include #include #define DECLARE_CHECKER_INSTANCE(CheckerType) static CheckerType const & Instance() { \ @@ -24,12 +26,12 @@ protected: uint8_t const m_level; std::vector m_types; - explicit BaseChecker(uint8_t level = 2) : m_level(level) {} + BaseChecker(uint8_t level = 2) : m_level(level) {} virtual ~BaseChecker() = default; public: virtual bool IsMatched(uint32_t type) const; - virtual void ForEachType(std::function const & fn) const; + virtual void ForEachType(std::function && fn) const; std::vector const & GetTypes() const { return m_types; } diff --git a/indexer/indexer_tests/editable_map_object_test.cpp b/indexer/indexer_tests/editable_map_object_test.cpp index 73593cf5d8..1fd405080e 100644 --- a/indexer/indexer_tests/editable_map_object_test.cpp +++ b/indexer/indexer_tests/editable_map_object_test.cpp @@ -199,8 +199,8 @@ UNIT_TEST(EditableMapObject_ValidateEmail) UNIT_TEST(EditableMapObject_ValidateName) { vector correctNames = {"abc", "абв", "ᆺᆯㅕ", "꫞ꪺꫀꪸ", "a b?c", "a!b.c", "a(b)c", "a,b.c", - "a$bc", "a%bc", "a#bc", "a№bc", "c&a", "a[bc"}; - vector incorrectNames = {"a^bc", "a~bc", "a§bc", "a>bc", "a incorrectNames = {"a^bc", "a~bc", "a§bc", "a>bc", "a-122.203329 37.374780 141.199997 -122.203207 37.374857 140.199997 - - absolute - 0 - - 9.42666332 52.94270656 95 - 2022-12-25T13:12:01.914Z - 9.42682572 52.94270115 94 - 2022-12-25T13:12:36Z - 9.42699411 52.94269624 94 - 2022-12-25T13:12:38Z - 9.42716915 52.94268793 95 - 2022-12-25T13:12:40Z - 9.42736231 52.94266046 95 - 2022-12-25T13:12:42Z - 9.42757536 52.94266963 96 - 2022-12-25T13:12:44Z - - - - 0 - 3.71 - 5.22 - 6.16 - 7.1 - 7.28 - - - - 1.57 - 1.62 - 1.64 - 1.69 - 1.56 - - - - - )"; @@ -870,7 +832,6 @@ UNIT_TEST(Kml_Ver_2_3) TEST_EQUAL(fData.m_tracksData.size(), 1, ()); auto const & lines = fData.m_tracksData[0].m_geometry.m_lines; - TEST_EQUAL(lines.size(), 2, ()); + TEST_EQUAL(lines.size(), 1, ()); TEST_EQUAL(lines[0].size(), 7, ()); - TEST_EQUAL(lines[1].size(), 6, ()); } diff --git a/kml/pykmlib/CMakeLists.txt b/kml/pykmlib/CMakeLists.txt index b9dc934b5f..e85481054d 100644 --- a/kml/pykmlib/CMakeLists.txt +++ b/kml/pykmlib/CMakeLists.txt @@ -20,7 +20,7 @@ omim_link_libraries( geometry base ICU::i18n - cppjansson + jansson oauthcpp protobuf pugixml diff --git a/kml/serdes.cpp b/kml/serdes.cpp index 9991fe0745..aa10e366dd 100644 --- a/kml/serdes.cpp +++ b/kml/serdes.cpp @@ -29,11 +29,9 @@ std::string_view const kExtendedData = "ExtendedData"; std::string const kCompilation = "mwm:compilation"; std::string_view const kCoordinates = "coordinates"; - -bool IsTrack(std::string const & s) -{ - return s == "Track" || s == "gx:Track"; -} +std::string_view const kTrack = "Track"; +std::string_view const gxTrack = "gx:Track"; +std::string_view const gxCoord = "gx:coord"; std::string const kKmlHeader = "\n" @@ -726,29 +724,28 @@ void KmlParser::SetOrigin(std::string const & s) m_org = pt; } -void KmlParser::ParseAndAddPoints(MultiGeometry::LineT & line, std::string_view s, - char const * blockSeparator, char const * coordSeparator) +void KmlParser::ParseAndAddPoint(MultiGeometry::LineT & line, std::string_view v, char const * separator) { - strings::Tokenize(s, blockSeparator, [&](std::string_view v) + geometry::PointWithAltitude point; + if (ParsePointWithAltitude(v, separator, point)) { - geometry::PointWithAltitude point; - if (ParsePointWithAltitude(v, coordSeparator, point)) - { - // We dont't expect vertical surfaces, so do not compare heights here. - // Will get a lot of duplicating points otherwise after import some user KMLs. - // https://github.com/organicmaps/organicmaps/issues/3895 - if (line.empty() || !AlmostEqualAbs(line.back().GetPoint(), point.GetPoint(), kMwmPointAccuracy)) - line.emplace_back(point); - } - }); + // We dont't expect vertical surfaces, so do not compare heights here. + // Will get a lot of duplicating points otherwise after import some user KMLs. + // https://github.com/organicmaps/organicmaps/issues/3895 + if (line.empty() || !AlmostEqualAbs(line.back().GetPoint(), point.GetPoint(), kMwmPointAccuracy)) + line.emplace_back(point); + } } -void KmlParser::ParseLineString(std::string const & s) +void KmlParser::ParseLineCoordinates(std::string const & s, char const * blockSeparator, char const * coordSeparator) { m_geometryType = GEOMETRY_TYPE_LINE; MultiGeometry::LineT line; - ParseAndAddPoints(line, s, " \n\r\t", ","); + strings::Tokenize(s, blockSeparator, [&](std::string_view v) + { + ParseAndAddPoint(line, v, coordSeparator); + }); if (line.size() > 1) m_geometry.m_lines.push_back(std::move(line)); @@ -895,7 +892,7 @@ std::string const & KmlParser::GetTagFromEnd(size_t n) const bool KmlParser::IsProcessTrackTag() const { size_t const n = m_tags.size(); - return n >= 3 && IsTrack(m_tags[n - 1]) && (m_tags[n - 2] == kPlacemark || m_tags[n - 3] == kPlacemark); + return n >= 3 && m_tags[n - 1] == kTrack && (m_tags[n - 2] == kPlacemark || m_tags[n - 3] == kPlacemark); } void KmlParser::Pop(std::string const & tag) @@ -1012,14 +1009,14 @@ void KmlParser::CharData(std::string value) auto const TrackTag = [this, &prevTag, &currTag, &value]() { - if (!IsTrack(prevTag)) + if (prevTag != kTrack) return false; - if (currTag == "coord" || currTag == "gx:coord") + if (currTag == "coord") { auto & lines = m_geometry.m_lines; ASSERT(!lines.empty(), ()); - ParseAndAddPoints(lines.back(), value, "\n\r\t", " "); + ParseAndAddPoint(lines.back(), value, " "); } return true; }; @@ -1203,7 +1200,12 @@ void KmlParser::CharData(std::string value) else if (prevTag == "LineString") { if (currTag == kCoordinates) - ParseLineString(value); + ParseLineCoordinates(value, " \n\r\t", ","); + } + else if (prevTag == gxTrack) + { + if (currTag == gxCoord) + ParseLineCoordinates(value, "\n\r\t", " "); } else if (TrackTag()) { @@ -1283,11 +1285,20 @@ void KmlParser::CharData(std::string value) else if (prevTag == "LineString") { if (currTag == kCoordinates) - ParseLineString(value); + ParseLineCoordinates(value, " \n\r\t", ","); } - else if (TrackTag()) + else if (prevTag == gxTrack) { - // noop + if (currTag == gxCoord) + ParseLineCoordinates(value, "\n\r\t", " "); + } + } + else if (ppTag == "gx:MultiTrack") + { + if (prevTag == gxTrack) + { + if (currTag == gxCoord) + ParseLineCoordinates(value, "\n\r\t", " "); } } else if (pppTag == kPlacemark) @@ -1334,7 +1345,7 @@ void KmlParser::CharData(std::string value) } } } - else if ((ppTag == "MultiTrack" || ppTag == "gx:MultiTrack") && TrackTag()) + else if (ppTag == "MultiTrack" && TrackTag()) { // noop } diff --git a/kml/serdes.hpp b/kml/serdes.hpp index 54aa82ced5..ab8d3385b1 100644 --- a/kml/serdes.hpp +++ b/kml/serdes.hpp @@ -91,9 +91,8 @@ private: void ResetPoint(); void SetOrigin(std::string const & s); - static void ParseAndAddPoints(MultiGeometry::LineT & line, std::string_view s, - char const * blockSeparator, char const * coordSeparator); - void ParseLineString(std::string const & s); + static void ParseAndAddPoint(MultiGeometry::LineT & line, std::string_view v, char const * separator); + void ParseLineCoordinates(std::string const & s, char const * blockSeparator, char const * coordSeparator); bool MakeValid(); void ParseColor(std::string const &value); diff --git a/map/benchmark_tools.cpp b/map/benchmark_tools.cpp index 1377a18ac7..15c5dee692 100644 --- a/map/benchmark_tools.cpp +++ b/map/benchmark_tools.cpp @@ -23,7 +23,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace { diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp index 37755e81d9..f7daf09aea 100644 --- a/map/routing_manager.cpp +++ b/map/routing_manager.cpp @@ -39,7 +39,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" using namespace routing; using namespace std; diff --git a/platform/background_downloader_ios.mm b/platform/background_downloader_ios.mm index 3eef6e64d1..a9e05ce54a 100644 --- a/platform/background_downloader_ios.mm +++ b/platform/background_downloader_ios.mm @@ -1,10 +1,9 @@ #import "platform/background_downloader_ios.h" -#include "base/logging.hpp" #include "platform/downloader_utils.hpp" // How many seconds to wait before the request fails. -static constexpr NSTimeInterval kTimeoutIntervalInSeconds = 10; +static const NSTimeInterval kTimeoutIntervalInSeconds = 10; @interface TaskInfo : NSObject diff --git a/platform/get_text_by_id.cpp b/platform/get_text_by_id.cpp index b3481335da..7d76bbeec6 100644 --- a/platform/get_text_by_id.cpp +++ b/platform/get_text_by_id.cpp @@ -5,7 +5,7 @@ #include "base/file_name_utils.hpp" #include "base/logging.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include "std/target_os.hpp" diff --git a/platform/http_uploader_background.mm b/platform/http_uploader_background.mm index 2a7133dcd2..b4063dfdca 100644 --- a/platform/http_uploader_background.mm +++ b/platform/http_uploader_background.mm @@ -2,9 +2,6 @@ #include "http_uploader_background.hpp" -#include "base/assert.hpp" -#include "base/logging.hpp" - static NSString *const kSessionId = @"MWMBackgroundUploader_sessionId"; @interface MWMBackgroundUploader : NSObject diff --git a/platform/platform_tests/CMakeLists.txt b/platform/platform_tests/CMakeLists.txt index 979329d224..b563063d22 100644 --- a/platform/platform_tests/CMakeLists.txt +++ b/platform/platform_tests/CMakeLists.txt @@ -19,5 +19,4 @@ omim_add_test_with_qt_event_loop(${PROJECT_NAME} ${SRC}) target_link_libraries(${PROJECT_NAME} platform_tests_support platform - cppjansson ) diff --git a/platform/platform_tests/jansson_test.cpp b/platform/platform_tests/jansson_test.cpp index 6453fcc28e..ff18e644a9 100644 --- a/platform/platform_tests/jansson_test.cpp +++ b/platform/platform_tests/jansson_test.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" UNIT_TEST(Jansson_Smoke) { diff --git a/platform/servers_list.cpp b/platform/servers_list.cpp index 03bf6a2037..666470c568 100644 --- a/platform/servers_list.cpp +++ b/platform/servers_list.cpp @@ -6,7 +6,7 @@ #include "base/logging.hpp" #include "base/assert.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace downloader { diff --git a/routing/mwm_hierarchy_handler.cpp b/routing/mwm_hierarchy_handler.cpp index a2e258ae8e..82277f4caf 100644 --- a/routing/mwm_hierarchy_handler.cpp +++ b/routing/mwm_hierarchy_handler.cpp @@ -20,7 +20,7 @@ std::unordered_set kSchengenArea = { "France", "Germany", "Greece", "Hungary", "Iceland", "Italy", "Latvia", "Liechtenstein", "Lithuania", "Luxembourg", "Malta", "Netherlands", "Norway", "Poland", "Portugal", "Slovakia", "Slovenia", "Spain", - "Sweden", "Switzerland", "Croatia" + "Sweden", "Switzerland" }; /// @return Top level hierarchy name for MWMs \a mwmName. diff --git a/routing/routing_integration_tests/route_test.cpp b/routing/routing_integration_tests/route_test.cpp index 42a732aeb8..d3b99fdd84 100644 --- a/routing/routing_integration_tests/route_test.cpp +++ b/routing/routing_integration_tests/route_test.cpp @@ -788,13 +788,4 @@ UNIT_TEST(Slovenia_Croatia_CrossBorderPenalty) FromLatLon(45.22718, 13.596334), 156285); } -UNIT_TEST(USA_Birmingham_AL_KeyWest_FL_NoMotorway) -{ - RoutingOptionSetter optionsGuard(RoutingOptions::Road::Motorway); - - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(33.5209837, -86.807945), {0., 0.}, - FromLatLon(24.5534713, -81.7932587), 1562980); -} - } // namespace route_test diff --git a/routing/routing_options.cpp b/routing/routing_options.cpp index fe0adee309..3868981d62 100644 --- a/routing/routing_options.cpp +++ b/routing/routing_options.cpp @@ -77,8 +77,6 @@ RoutingOptionsClassifier::RoutingOptionsClassifier() optional RoutingOptionsClassifier::Get(uint32_t type) const { - ftype::TruncValue(type, 2); // in case of highway-motorway-bridge - auto const * res = m_data.Find(type); if (res) return *res; diff --git a/routing_common/vehicle_model.cpp b/routing_common/vehicle_model.cpp index ae34bd47f5..818fd15eba 100644 --- a/routing_common/vehicle_model.cpp +++ b/routing_common/vehicle_model.cpp @@ -385,7 +385,6 @@ string DebugPrint(HighwayType type) case HighwayType::HighwaySecondaryLink: return "highway-secondary_link"; case HighwayType::RouteFerry: return "route-ferry"; case HighwayType::HighwayTertiaryLink: return "highway-tertiary_link"; - case HighwayType::HighwayBusway: return "highway-busway"; case HighwayType::RailwayRailMotorVehicle: return "railway-rail-motor_vehicle"; case HighwayType::RouteShuttleTrain: return "route-shuttle_train"; } diff --git a/routing_common/vehicle_model.hpp b/routing_common/vehicle_model.hpp index 33ab35a295..0c36741e2c 100644 --- a/routing_common/vehicle_model.hpp +++ b/routing_common/vehicle_model.hpp @@ -54,7 +54,6 @@ enum class HighwayType : uint16_t HighwaySecondaryLink = 176, RouteFerry = 259, HighwayTertiaryLink = 272, - HighwayBusway = 858, // reserve type here, but this type is not used for any routing by default RailwayRailMotorVehicle = 994, RouteShuttleTrain = 1054, }; diff --git a/search/pysearch/CMakeLists.txt b/search/pysearch/CMakeLists.txt index afa2e0d0f7..cc460b7f21 100644 --- a/search/pysearch/CMakeLists.txt +++ b/search/pysearch/CMakeLists.txt @@ -25,7 +25,7 @@ omim_link_libraries( base bsdiff ICU::i18n - cppjansson + jansson oauthcpp opening_hours protobuf diff --git a/search/search_quality/helpers.cpp b/search/search_quality/helpers.cpp index 8e84ac45ec..c5ec664248 100644 --- a/search/search_quality/helpers.cpp +++ b/search/search_quality/helpers.cpp @@ -20,7 +20,7 @@ #include "defines.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace search { diff --git a/search/search_quality/helpers_json.hpp b/search/search_quality/helpers_json.hpp index 16f906bab8..6c69bcfbde 100644 --- a/search/search_quality/helpers_json.hpp +++ b/search/search_quality/helpers_json.hpp @@ -6,7 +6,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace m2 { diff --git a/search/search_quality/sample.hpp b/search/search_quality/sample.hpp index 8803075f83..faffcbb010 100644 --- a/search/search_quality/sample.hpp +++ b/search/search_quality/sample.hpp @@ -5,7 +5,7 @@ #include "base/string_utils.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index 35a6a527b6..0ce66d4e03 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -67,7 +67,7 @@ target_link_libraries(${PROJECT_NAME} platform coding mwm_diff - cppjansson + jansson ) omim_add_test_subdirectory(storage_tests) diff --git a/storage/country_tree.cpp b/storage/country_tree.cpp index 87aba15450..556ed1f6cd 100644 --- a/storage/country_tree.cpp +++ b/storage/country_tree.cpp @@ -13,7 +13,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" using namespace std; using platform::CountryFile; diff --git a/storage/diff_scheme/diff_scheme_loader.cpp b/storage/diff_scheme/diff_scheme_loader.cpp index 6b04e7d88a..fdb11c3296 100644 --- a/storage/diff_scheme/diff_scheme_loader.cpp +++ b/storage/diff_scheme/diff_scheme_loader.cpp @@ -11,7 +11,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include "private.h" diff --git a/storage/storage.cpp b/storage/storage.cpp index a301eab5a5..f5e14dc9cd 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -27,7 +27,7 @@ #include "defines.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt index e8c6a7d078..3233d526f3 100644 --- a/storage/storage_tests/CMakeLists.txt +++ b/storage/storage_tests/CMakeLists.txt @@ -23,5 +23,4 @@ target_link_libraries(${PROJECT_NAME} platform_tests_support generator_tests_support storage - cppjansson ) diff --git a/traffic/pytraffic/CMakeLists.txt b/traffic/pytraffic/CMakeLists.txt index c51e2d52aa..cab110c81a 100644 --- a/traffic/pytraffic/CMakeLists.txt +++ b/traffic/pytraffic/CMakeLists.txt @@ -36,7 +36,7 @@ omim_link_libraries( geometry coding base - cppjansson + jansson oauthcpp protobuf pugixml diff --git a/transit/experimental/transit_data.hpp b/transit/experimental/transit_data.hpp index 97cca18e17..d691a08b01 100644 --- a/transit/experimental/transit_data.hpp +++ b/transit/experimental/transit_data.hpp @@ -20,7 +20,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace transit { diff --git a/transit/transit_graph_data.hpp b/transit/transit_graph_data.hpp index ad943b9071..7a36dbe125 100644 --- a/transit/transit_graph_data.hpp +++ b/transit/transit_graph_data.hpp @@ -12,7 +12,7 @@ #include "base/geo_object_id.hpp" #include "base/visitor.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include diff --git a/transit/world_feed/world_feed.cpp b/transit/world_feed/world_feed.cpp index 524f9109f1..37903da7da 100644 --- a/transit/world_feed/world_feed.cpp +++ b/transit/world_feed/world_feed.cpp @@ -20,7 +20,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace { diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index d3b45e2197..ed81ae1f1c 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -800,6 +800,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34BA2D6A1DBE169E00FAB345 /* common-debug.xcconfig */; buildSettings = { + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Debug; }; @@ -807,6 +808,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */; buildSettings = { + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Release; }; @@ -814,10 +816,6 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/fast_double_parser/include", - ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -826,10 +824,6 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/fast_double_parser/include", - ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index 5beadd6487..5e61d40f6d 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -140,7 +140,7 @@ F6C269FE1F176FFE00EB6519 /* csv_reader_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6C269FD1F176FFE00EB6519 /* csv_reader_test.cpp */; }; FACB76A926B89C2200810C9C /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76A826B89C2200810C9C /* libbase.a */; }; FACB76AB26B89C3000810C9C /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76AA26B89C3000810C9C /* minizip.framework */; }; - FACB76AD26B89C3F00810C9C /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76AC26B89C3F00810C9C /* libcppjansson.a */; }; + FACB76AD26B89C3F00810C9C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76AC26B89C3F00810C9C /* libjansson.a */; }; FACB76AF26B89CFB00810C9C /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76AE26B89CFB00810C9C /* libz.tbd */; }; FACB76B326B89D3A00810C9C /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76B226B89D3A00810C9C /* libsuccinct.a */; }; FAF23E22274E406400684735 /* huffman.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 394917231BAC3C2F002A8C4F /* huffman.hpp */; }; @@ -313,7 +313,7 @@ F6C269FD1F176FFE00EB6519 /* csv_reader_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csv_reader_test.cpp; sourceTree = ""; }; FACB76A826B89C2200810C9C /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76AA26B89C3000810C9C /* minizip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = minizip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - FACB76AC26B89C3F00810C9C /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FACB76AC26B89C3F00810C9C /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76AE26B89CFB00810C9C /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; FACB76B026B89D0700810C9C /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76B226B89D3A00810C9C /* libsuccinct.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsuccinct.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -336,7 +336,7 @@ FAF23E27274E425000684735 /* libexpat.a in Frameworks */, FACB76B326B89D3A00810C9C /* libsuccinct.a in Frameworks */, FACB76AF26B89CFB00810C9C /* libz.tbd in Frameworks */, - FACB76AD26B89C3F00810C9C /* libcppjansson.a in Frameworks */, + FACB76AD26B89C3F00810C9C /* libjansson.a in Frameworks */, FACB76AB26B89C3000810C9C /* minizip.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -360,7 +360,7 @@ FACB76B226B89D3A00810C9C /* libsuccinct.a */, FACB76B026B89D0700810C9C /* libplatform.a */, FACB76AE26B89CFB00810C9C /* libz.tbd */, - FACB76AC26B89C3F00810C9C /* libcppjansson.a */, + FACB76AC26B89C3F00810C9C /* libjansson.a */, FACB76AA26B89C3000810C9C /* minizip.framework */, FACB76A826B89C2200810C9C /* libbase.a */, ); @@ -835,6 +835,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -843,6 +844,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index 96a9cc8bb9..27f893d48f 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -81,6 +81,7 @@ GCC_FAST_MATH = YES // -fvisibility-inlines-hidden GCC_INLINES_ARE_PRIVATE_EXTERN = YES GCC_NO_COMMON_BLOCKS = YES +GCC_PRECOMPILE_PREFIX_HEADER = YES // Preprocessor definitions shared in all configurations and projects. // Silence "Migrate from OpenGL to Metal" warnings. GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COREVIDEO_SILENCE_GL_DEPRECATION GLES_SILENCE_DEPRECATION diff --git a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj b/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj deleted file mode 100644 index 6e171ae332..0000000000 --- a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj +++ /dev/null @@ -1,220 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 55; - objects = { - -/* Begin PBXBuildFile section */ - 7168E91A294CBB91005BA468 /* jansson_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7168E917294CBB91005BA468 /* jansson_handle.cpp */; }; - 7168E91B294CBB91005BA468 /* cppjansson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7168E919294CBB91005BA468 /* cppjansson.cpp */; }; - 71D730FE294CCAA000F3EEC2 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71D730FD294CCAA000F3EEC2 /* libjansson.a */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 71407E77294CB3E800FBD9A4 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 71407E71294CB35000FBD9A4 /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; - 71407E74294CB37700FBD9A4 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; - 71407E79294CB3E800FBD9A4 /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 7168E916294CBB91005BA468 /* cppjansson.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cppjansson.hpp; sourceTree = ""; }; - 7168E917294CBB91005BA468 /* jansson_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jansson_handle.cpp; sourceTree = ""; }; - 7168E918294CBB91005BA468 /* jansson_handle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jansson_handle.hpp; sourceTree = ""; }; - 7168E919294CBB91005BA468 /* cppjansson.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cppjansson.cpp; sourceTree = ""; }; - 71D730FD294CCAA000F3EEC2 /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 71407E76294CB3E800FBD9A4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 71D730FE294CCAA000F3EEC2 /* libjansson.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 71407E4A294C9FCE00FBD9A4 = { - isa = PBXGroup; - children = ( - 71D730FC294CC4B400F3EEC2 /* Frameworks */, - 71407E74294CB37700FBD9A4 /* common-release.xcconfig */, - 71407E71294CB35000FBD9A4 /* common-debug.xcconfig */, - 71407E7A294CB3E800FBD9A4 /* cppjansson */, - 71407E58294C9FD000FBD9A4 /* Products */, - ); - sourceTree = ""; - }; - 71407E58294C9FD000FBD9A4 /* Products */ = { - isa = PBXGroup; - children = ( - 71407E79294CB3E800FBD9A4 /* libcppjansson.a */, - ); - name = Products; - sourceTree = ""; - }; - 71407E7A294CB3E800FBD9A4 /* cppjansson */ = { - isa = PBXGroup; - children = ( - 7168E917294CBB91005BA468 /* jansson_handle.cpp */, - 7168E918294CBB91005BA468 /* jansson_handle.hpp */, - 7168E919294CBB91005BA468 /* cppjansson.cpp */, - 7168E916294CBB91005BA468 /* cppjansson.hpp */, - ); - name = cppjansson; - path = ../../cppjansson; - sourceTree = ""; - }; - 71D730FC294CC4B400F3EEC2 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 71D730FD294CCAA000F3EEC2 /* libjansson.a */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 71407E78294CB3E800FBD9A4 /* cppjansson */ = { - isa = PBXNativeTarget; - buildConfigurationList = 71407E7D294CB3E800FBD9A4 /* Build configuration list for PBXNativeTarget "cppjansson" */; - buildPhases = ( - 71407E75294CB3E800FBD9A4 /* Sources */, - 71407E76294CB3E800FBD9A4 /* Frameworks */, - 71407E77294CB3E800FBD9A4 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = cppjansson; - productName = cppjansson; - productReference = 71407E79294CB3E800FBD9A4 /* libcppjansson.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 71407E4B294C9FCE00FBD9A4 /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = 1; - DefaultBuildSystemTypeForWorkspace = Latest; - LastSwiftUpdateCheck = 1330; - LastUpgradeCheck = 1330; - TargetAttributes = { - 71407E78294CB3E800FBD9A4 = { - CreatedOnToolsVersion = 13.3; - }; - }; - }; - buildConfigurationList = 71407E4E294C9FCE00FBD9A4 /* Build configuration list for PBXProject "cppjansson" */; - compatibilityVersion = "Xcode 13.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 71407E4A294C9FCE00FBD9A4; - productRefGroup = 71407E58294C9FD000FBD9A4 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 71407E78294CB3E800FBD9A4 /* cppjansson */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 71407E75294CB3E800FBD9A4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7168E91B294CBB91005BA468 /* cppjansson.cpp in Sources */, - 7168E91A294CBB91005BA468 /* jansson_handle.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 71407E66294C9FD000FBD9A4 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 71407E71294CB35000FBD9A4 /* common-debug.xcconfig */; - buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../", - "$(PROJECT_DIR)/../../3party/jansson", - "$(PROJECT_DIR)/../../3party/jansson/jansson/src", - ); - }; - name = Debug; - }; - 71407E67294C9FD000FBD9A4 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 71407E74294CB37700FBD9A4 /* common-release.xcconfig */; - buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../", - "$(PROJECT_DIR)/../../3party/jansson", - "$(PROJECT_DIR)/../../3party/jansson/jansson/src", - ); - }; - name = Release; - }; - 71407E7E294CB3E800FBD9A4 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 71407E7F294CB3E800FBD9A4 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 71407E4E294C9FCE00FBD9A4 /* Build configuration list for PBXProject "cppjansson" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 71407E66294C9FD000FBD9A4 /* Debug */, - 71407E67294C9FD000FBD9A4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 71407E7D294CB3E800FBD9A4 /* Build configuration list for PBXNativeTarget "cppjansson" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 71407E7E294CB3E800FBD9A4 /* Debug */, - 71407E7F294CB3E800FBD9A4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 71407E4B294C9FCE00FBD9A4 /* Project object */; -} diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj index 1acf0eeacd..379f30c4a7 100644 --- a/xcode/drape/drape.xcodeproj/project.pbxproj +++ b/xcode/drape/drape.xcodeproj/project.pbxproj @@ -768,6 +768,7 @@ buildSettings = { EXCLUDED_SOURCE_FILE_NAMES = ""; EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -777,6 +778,7 @@ buildSettings = { EXCLUDED_SOURCE_FILE_NAMES = ""; EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index cc17b59b06..9a1edfe63c 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -993,6 +993,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1001,6 +1002,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index 2f834ea4a8..9b7a4816aa 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -67,7 +67,7 @@ FACB76D326B8A13700810C9C /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76D226B8A13700810C9C /* libgenerator.a */; }; FACB76D526B8A15100810C9C /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76D426B8A15100810C9C /* libstorage.a */; }; FACB76D726B8A18F00810C9C /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76D626B8A18F00810C9C /* libsuccinct.a */; }; - FACB76D926B8A22000810C9C /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76D826B8A22000810C9C /* libcppjansson.a */; }; + FACB76D926B8A22000810C9C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76D826B8A22000810C9C /* libjansson.a */; }; FACB76DA26B8A23E00810C9C /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76CC26B8A0DC00810C9C /* libgenerator_tests_support.a */; }; FACB76DE26B8A27000810C9C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76DD26B8A27000810C9C /* libsearch.a */; }; FACB76E026B8A28600810C9C /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76DF26B8A28600810C9C /* librouting_common.a */; }; @@ -142,7 +142,7 @@ FACB76D226B8A13700810C9C /* libgenerator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76D426B8A15100810C9C /* libstorage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libstorage.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76D626B8A18F00810C9C /* libsuccinct.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsuccinct.a; sourceTree = BUILT_PRODUCTS_DIR; }; - FACB76D826B8A22000810C9C /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FACB76D826B8A22000810C9C /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76DB26B8A25100810C9C /* librouting.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76DD26B8A27000810C9C /* libsearch.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsearch.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76DF26B8A28600810C9C /* librouting_common.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting_common.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -165,7 +165,7 @@ FACB76E026B8A28600810C9C /* librouting_common.a in Frameworks */, FACB76DE26B8A27000810C9C /* libsearch.a in Frameworks */, FACB76DA26B8A23E00810C9C /* libgenerator_tests_support.a in Frameworks */, - FACB76D926B8A22000810C9C /* libcppjansson.a in Frameworks */, + FACB76D926B8A22000810C9C /* libjansson.a in Frameworks */, FACB76BB26B89FFE00810C9C /* libbase.a in Frameworks */, FACB76C326B8A03600810C9C /* libcoding.a in Frameworks */, FACB76BF26B8A00B00810C9C /* liboauthcpp.a in Frameworks */, @@ -286,7 +286,7 @@ FACB76DF26B8A28600810C9C /* librouting_common.a */, FACB76DD26B8A27000810C9C /* libsearch.a */, FACB76DB26B8A25100810C9C /* librouting.a */, - FACB76D826B8A22000810C9C /* libcppjansson.a */, + FACB76D826B8A22000810C9C /* libjansson.a */, FACB76D626B8A18F00810C9C /* libsuccinct.a */, FACB76D426B8A15100810C9C /* libstorage.a */, FACB76D226B8A13700810C9C /* libgenerator.a */, @@ -524,6 +524,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -532,6 +533,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index 35ef699455..f9f4f90d69 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -28,7 +28,7 @@ FACB776D26B90CA800810C9C /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB776C26B90CA800810C9C /* libicu.a */; }; FACB776F26B90CAD00810C9C /* libgflags.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB776E26B90CAD00810C9C /* libgflags.a */; }; FACB777126B90CC300810C9C /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777026B90CC300810C9C /* libexpat.a */; }; - FACB777326B90CCF00810C9C /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777226B90CCF00810C9C /* libcppjansson.a */; }; + FACB777326B90CCF00810C9C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777226B90CCF00810C9C /* libjansson.a */; }; FACB777526B90CEE00810C9C /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777426B90CEE00810C9C /* libdescriptions.a */; }; FACB777726B90CF200810C9C /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777626B90CF200810C9C /* minizip.framework */; }; FACB777926B90CFB00810C9C /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777826B90CFB00810C9C /* libprotobuf.a */; }; @@ -326,7 +326,7 @@ FACB776C26B90CA800810C9C /* libicu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libicu.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB776E26B90CAD00810C9C /* libgflags.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgflags.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB777026B90CC300810C9C /* libexpat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libexpat.a; sourceTree = BUILT_PRODUCTS_DIR; }; - FACB777226B90CCF00810C9C /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FACB777226B90CCF00810C9C /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB777426B90CEE00810C9C /* libdescriptions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdescriptions.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB777626B90CF200810C9C /* minizip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = minizip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FACB777826B90CFB00810C9C /* libprotobuf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libprotobuf.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -614,7 +614,7 @@ FACB777D26B90E5B00810C9C /* liboauthcpp.a in Frameworks */, FACB777926B90CFB00810C9C /* libprotobuf.a in Frameworks */, FACB777726B90CF200810C9C /* minizip.framework in Frameworks */, - FACB777326B90CCF00810C9C /* libcppjansson.a in Frameworks */, + FACB777326B90CCF00810C9C /* libjansson.a in Frameworks */, FACB777126B90CC300810C9C /* libexpat.a in Frameworks */, FACB776F26B90CAD00810C9C /* libgflags.a in Frameworks */, FACB776D26B90CA800810C9C /* libicu.a in Frameworks */, @@ -709,7 +709,7 @@ FACB777826B90CFB00810C9C /* libprotobuf.a */, FACB777626B90CF200810C9C /* minizip.framework */, FACB777426B90CEE00810C9C /* libdescriptions.a */, - FACB777226B90CCF00810C9C /* libcppjansson.a */, + FACB777226B90CCF00810C9C /* libjansson.a */, FACB777026B90CC300810C9C /* libexpat.a */, FACB776E26B90CAD00810C9C /* libgflags.a */, FACB776C26B90CA800810C9C /* libicu.a */, @@ -1384,6 +1384,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1392,6 +1393,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index 024b91f580..00cab3d567 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -672,6 +672,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -680,6 +681,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 8e49ae17e1..f626e347fa 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -203,7 +203,7 @@ FACB7C2D26B919FD00810C9C /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C2C26B919FD00810C9C /* libpugixml.a */; }; FACB7C2F26B91A1100810C9C /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C2E26B91A1100810C9C /* libopening_hours.a */; }; FACB7C3126B91A3600810C9C /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3026B91A3600810C9C /* libgenerator.a */; }; - FACB7C3326B91A4500810C9C /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3226B91A4500810C9C /* libcppjansson.a */; }; + FACB7C3326B91A4500810C9C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3226B91A4500810C9C /* libjansson.a */; }; FACB7C3526B91A4B00810C9C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3426B91A4B00810C9C /* libsearch.a */; }; FACB7C3726B91A5A00810C9C /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3626B91A5A00810C9C /* librouting_common.a */; }; FACB7C3926B91AE600810C9C /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3826B91AE600810C9C /* librouting.a */; }; @@ -428,7 +428,7 @@ FACB7C2C26B919FD00810C9C /* libpugixml.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libpugixml.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB7C2E26B91A1100810C9C /* libopening_hours.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libopening_hours.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB7C3026B91A3600810C9C /* libgenerator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator.a; sourceTree = BUILT_PRODUCTS_DIR; }; - FACB7C3226B91A4500810C9C /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FACB7C3226B91A4500810C9C /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB7C3426B91A4B00810C9C /* libsearch.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsearch.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB7C3626B91A5A00810C9C /* librouting_common.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting_common.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB7C3826B91AE600810C9C /* librouting.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -463,7 +463,7 @@ FACB7C4526B947C400810C9C /* libz.tbd in Frameworks */, FACB7C2726B919D300810C9C /* libprotobuf.a in Frameworks */, FACB7C2126B919AD00810C9C /* libplatform.a in Frameworks */, - FACB7C3326B91A4500810C9C /* libcppjansson.a in Frameworks */, + FACB7C3326B91A4500810C9C /* libjansson.a in Frameworks */, FACB7C2D26B919FD00810C9C /* libpugixml.a in Frameworks */, 670C61401AB066CD00C38A8C /* libindexer.a in Frameworks */, FACB7C3926B91AE600810C9C /* librouting.a in Frameworks */, @@ -514,7 +514,7 @@ FACB7C3826B91AE600810C9C /* librouting.a */, FACB7C3626B91A5A00810C9C /* librouting_common.a */, FACB7C3426B91A4B00810C9C /* libsearch.a */, - FACB7C3226B91A4500810C9C /* libcppjansson.a */, + FACB7C3226B91A4500810C9C /* libjansson.a */, FACB7C3026B91A3600810C9C /* libgenerator.a */, FACB7C2E26B91A1100810C9C /* libopening_hours.a */, FACB7C2C26B919FD00810C9C /* libpugixml.a */, @@ -1085,6 +1085,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1093,6 +1094,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/jansson/jansson.xcodeproj/project.pbxproj b/xcode/jansson/jansson.xcodeproj/project.pbxproj index 3fa67d2d38..045120bcf8 100644 --- a/xcode/jansson/jansson.xcodeproj/project.pbxproj +++ b/xcode/jansson/jansson.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 345C55F81C93143B00B6783F /* myjansson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 345C55F71C93143B00B6783F /* myjansson.cpp */; }; + 6753445F1A3F666300A0A8C3 /* jansson_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753445B1A3F666300A0A8C3 /* jansson_handle.cpp */; }; + 675344601A3F666300A0A8C3 /* jansson_handle.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753445C1A3F666300A0A8C3 /* jansson_handle.hpp */; }; + 675344611A3F666300A0A8C3 /* myjansson.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753445D1A3F666300A0A8C3 /* myjansson.hpp */; }; FAA6D8CD29205A2200E8D50D /* jansson_config.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA6D8CC29205A2200E8D50D /* jansson_config.h */; }; FAA8867929214906004FA014 /* pack_unpack.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA8866429214906004FA014 /* pack_unpack.c */; }; FAA8867A29214906004FA014 /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA8866629214906004FA014 /* memory.c */; }; @@ -30,9 +34,13 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 345C55F71C93143B00B6783F /* myjansson.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = myjansson.cpp; sourceTree = ""; }; 34F558681DBF483000A4FC11 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; 34F558691DBF483000A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 6753444D1A3F664300A0A8C3 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 6753445B1A3F666300A0A8C3 /* jansson_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jansson_handle.cpp; sourceTree = ""; }; + 6753445C1A3F666300A0A8C3 /* jansson_handle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jansson_handle.hpp; sourceTree = ""; }; + 6753445D1A3F666300A0A8C3 /* myjansson.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = myjansson.hpp; sourceTree = ""; }; FAA6D8CC29205A2200E8D50D /* jansson_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jansson_config.h; sourceTree = ""; }; FAA8866429214906004FA014 /* pack_unpack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pack_unpack.c; sourceTree = ""; }; FAA8866529214906004FA014 /* jansson_config.h.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = jansson_config.h.in; sourceTree = ""; }; @@ -91,7 +99,11 @@ isa = PBXGroup; children = ( FAA6D8CC29205A2200E8D50D /* jansson_config.h */, + 6753445B1A3F666300A0A8C3 /* jansson_handle.cpp */, + 6753445C1A3F666300A0A8C3 /* jansson_handle.hpp */, FAA8868B29214A0D004FA014 /* jansson_private_config.h */, + 345C55F71C93143B00B6783F /* myjansson.cpp */, + 6753445D1A3F666300A0A8C3 /* myjansson.hpp */, FAA8866329214906004FA014 /* src */, ); name = jansson; @@ -136,11 +148,13 @@ files = ( FAA8867E29214906004FA014 /* utf.h in Headers */, FAA8868029214906004FA014 /* lookup3.h in Headers */, + 675344601A3F666300A0A8C3 /* jansson_handle.hpp in Headers */, FAA8868729214906004FA014 /* jansson.h in Headers */, FAA8867C29214906004FA014 /* jansson_private.h in Headers */, FAA8867D29214906004FA014 /* hashtable.h in Headers */, FAA8868A29214906004FA014 /* strbuffer.h in Headers */, FAA8868C29214A0E004FA014 /* jansson_private_config.h in Headers */, + 675344611A3F666300A0A8C3 /* myjansson.hpp in Headers */, FAA6D8CD29205A2200E8D50D /* jansson_config.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -202,12 +216,14 @@ buildActionMask = 2147483647; files = ( FAA8868829214906004FA014 /* load.c in Sources */, + 345C55F81C93143B00B6783F /* myjansson.cpp in Sources */, FAA8867929214906004FA014 /* pack_unpack.c in Sources */, FAA8868429214906004FA014 /* hashtable.c in Sources */, FAA8867A29214906004FA014 /* memory.c in Sources */, FAA8868529214906004FA014 /* version.c in Sources */, FAA8868329214906004FA014 /* error.c in Sources */, FAA8867F29214906004FA014 /* strbuffer.c in Sources */, + 6753445F1A3F666300A0A8C3 /* jansson_handle.cpp in Sources */, FAA8868229214906004FA014 /* hashtable_seed.c in Sources */, FAA8868629214906004FA014 /* utf.c in Sources */, FAA8868129214906004FA014 /* dump.c in Sources */, diff --git a/xcode/kml/kml.xcodeproj/project.pbxproj b/xcode/kml/kml.xcodeproj/project.pbxproj index 0b85753cde..70417d448f 100644 --- a/xcode/kml/kml.xcodeproj/project.pbxproj +++ b/xcode/kml/kml.xcodeproj/project.pbxproj @@ -304,12 +304,14 @@ 45E45587205849A600D9F45E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Debug; }; 45E45588205849A600D9F45E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Release; }; diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index b56ab9196e..3cf2116551 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -111,7 +111,7 @@ FAA8387E26BB3C92002E54C6 /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8387D26BB3C92002E54C6 /* libindexer.a */; }; FAA8388026BB3C92002E54C6 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8387F26BB3C92002E54C6 /* libplatform.a */; }; FAA8388226BB3C92002E54C6 /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388126BB3C92002E54C6 /* libprotobuf.a */; }; - FAA8388426BB3CBE002E54C6 /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388326BB3CBE002E54C6 /* libcppjansson.a */; }; + FAA8388426BB3CBE002E54C6 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388326BB3CBE002E54C6 /* libjansson.a */; }; FAA8388626BB3CC3002E54C6 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388526BB3CC3002E54C6 /* libexpat.a */; }; FAA8388826BB3CDB002E54C6 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388726BB3CDB002E54C6 /* liboauthcpp.a */; }; FAA8388A26BB3CE4002E54C6 /* libdrape.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388926BB3CE4002E54C6 /* libdrape.a */; }; @@ -255,7 +255,7 @@ FAA8387D26BB3C92002E54C6 /* libindexer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8387F26BB3C92002E54C6 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8388126BB3C92002E54C6 /* libprotobuf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libprotobuf.a; sourceTree = BUILT_PRODUCTS_DIR; }; - FAA8388326BB3CBE002E54C6 /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FAA8388326BB3CBE002E54C6 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8388526BB3CC3002E54C6 /* libexpat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libexpat.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8388726BB3CDB002E54C6 /* liboauthcpp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liboauthcpp.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8388926BB3CE4002E54C6 /* libdrape.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdrape.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -277,7 +277,7 @@ FAA8388A26BB3CE4002E54C6 /* libdrape.a in Frameworks */, FAA8388826BB3CDB002E54C6 /* liboauthcpp.a in Frameworks */, FAA8388626BB3CC3002E54C6 /* libexpat.a in Frameworks */, - FAA8388426BB3CBE002E54C6 /* libcppjansson.a in Frameworks */, + FAA8388426BB3CBE002E54C6 /* libjansson.a in Frameworks */, FAA8387826BB3C92002E54C6 /* libbase.a in Frameworks */, FAA8387A26BB3C92002E54C6 /* libcoding.a in Frameworks */, FAA8387C26BB3C92002E54C6 /* libgeometry.a in Frameworks */, @@ -304,7 +304,7 @@ FAA8388926BB3CE4002E54C6 /* libdrape.a */, FAA8388726BB3CDB002E54C6 /* liboauthcpp.a */, FAA8388526BB3CC3002E54C6 /* libexpat.a */, - FAA8388326BB3CBE002E54C6 /* libcppjansson.a */, + FAA8388326BB3CBE002E54C6 /* libjansson.a */, FAA8387726BB3C92002E54C6 /* libbase.a */, FAA8387926BB3C92002E54C6 /* libcoding.a */, FAA8387B26BB3C92002E54C6 /* libgeometry.a */, @@ -785,6 +785,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; WARNING_CFLAGS = "-Wno-deprecated-register "; }; @@ -794,6 +795,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; WARNING_CFLAGS = "-Wno-deprecated-register "; }; diff --git a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj index cbdde31d89..2c0906935a 100644 --- a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj +++ b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj @@ -151,6 +151,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -159,6 +160,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index 168c39cefa..58cf61847f 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -97,9 +97,6 @@ - - diff --git a/xcode/openlr/openlr.xcodeproj/project.pbxproj b/xcode/openlr/openlr.xcodeproj/project.pbxproj index 2d6c796bb9..ffb317d94c 100644 --- a/xcode/openlr/openlr.xcodeproj/project.pbxproj +++ b/xcode/openlr/openlr.xcodeproj/project.pbxproj @@ -271,6 +271,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -279,6 +280,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index 45592a03e3..de240fdeca 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -116,7 +116,7 @@ FAA8388D26BB4841002E54C6 /* test_socket.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675E889F1DB7B0F200F8EBDA /* test_socket.hpp */; }; FAA8388E26BB4849002E54C6 /* writable_dir_changer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FFB1C60BD6500EDE56A /* writable_dir_changer.cpp */; }; FAA8388F26BB484C002E54C6 /* writable_dir_changer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67247FFC1C60BD6500EDE56A /* writable_dir_changer.hpp */; }; - FAA8389126BB48E9002E54C6 /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8389026BB48E9002E54C6 /* libcppjansson.a */; }; + FAA8389126BB48E9002E54C6 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8389026BB48E9002E54C6 /* libjansson.a */; }; FAA8389326BB48EF002E54C6 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8389226BB48EF002E54C6 /* libbase.a */; }; FAA8389526BB48F4002E54C6 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8389426BB48F4002E54C6 /* libcoding.a */; }; FAA8389726BB4906002E54C6 /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8389626BB4906002E54C6 /* minizip.framework */; }; @@ -241,7 +241,7 @@ EB60B4DD204C175700E4953B /* network_policy_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = network_policy_ios.h; sourceTree = ""; }; F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_storage_base.cpp; sourceTree = ""; }; F6DF73571EC9EAE700D8BA0B /* string_storage_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_storage_base.hpp; sourceTree = ""; }; - FAA8389026BB48E9002E54C6 /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FAA8389026BB48E9002E54C6 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8389226BB48EF002E54C6 /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8389426BB48F4002E54C6 /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8389626BB4906002E54C6 /* minizip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = minizip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -276,7 +276,7 @@ FAA8389726BB4906002E54C6 /* minizip.framework in Frameworks */, FAA8389526BB48F4002E54C6 /* libcoding.a in Frameworks */, FAA8389326BB48EF002E54C6 /* libbase.a in Frameworks */, - FAA8389126BB48E9002E54C6 /* libcppjansson.a in Frameworks */, + FAA8389126BB48E9002E54C6 /* libjansson.a in Frameworks */, 678338A81C6DE5E300FD6263 /* libplatform.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -292,7 +292,7 @@ FAA8389626BB4906002E54C6 /* minizip.framework */, FAA8389426BB48F4002E54C6 /* libcoding.a */, FAA8389226BB48EF002E54C6 /* libbase.a */, - FAA8389026BB48E9002E54C6 /* libcppjansson.a */, + FAA8389026BB48E9002E54C6 /* libjansson.a */, ); name = Frameworks; sourceTree = ""; @@ -754,20 +754,32 @@ platform_ios.mm, secure_storage_ios.mm, ); - "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = "$(inherited)"; - "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited)"; + "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + ); "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( "$(inherited)", "$(QT_PATH)/lib", ); - "HEADER_SEARCH_PATHS[sdk=iphoneos*]" = "$(inherited)"; - "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited)"; + "HEADER_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + ); + "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + ); "HEADER_SEARCH_PATHS[sdk=macosx*]" = ( "$(inherited)", "$(QT_PATH)/include", ); - "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(inherited)"; - "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited)"; + "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + ); + "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + ); "LIBRARY_SEARCH_PATHS[sdk=macosx*]" = ( "$(inherited)", "$(QT_PATH)/lib", @@ -843,6 +855,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -857,6 +870,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj index f1812c4916..8d7e771757 100644 --- a/xcode/routing/routing.xcodeproj/project.pbxproj +++ b/xcode/routing/routing.xcodeproj/project.pbxproj @@ -1365,6 +1365,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1373,6 +1374,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj index 484e1270f4..6b17e6052f 100644 --- a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj +++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj @@ -270,6 +270,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -278,6 +279,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index 07d68eb67f..07e40d664d 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -57,7 +57,7 @@ 34EEAD721E55AE5C00E95575 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34EEAD711E55AE5C00E95575 /* utils.cpp */; }; 34F5583D1DBF2E2700A4FC11 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F5583C1DBF2E2700A4FC11 /* libeditor.a */; }; 34F5583F1DBF2E3400A4FC11 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F5583E1DBF2E3400A4FC11 /* libpugixml.a */; }; - 34F558411DBF2E4F00A4FC11 /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558401DBF2E4F00A4FC11 /* libcppjansson.a */; }; + 34F558411DBF2E4F00A4FC11 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558401DBF2E4F00A4FC11 /* libjansson.a */; }; 34F558431DBF2E6500A4FC11 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558421DBF2E6500A4FC11 /* liboauthcpp.a */; }; 34F558451DBF2E7600A4FC11 /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558441DBF2E7600A4FC11 /* libopening_hours.a */; }; 34F558471DBF2E8100A4FC11 /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558461DBF2E8100A4FC11 /* libsuccinct.a */; }; @@ -105,7 +105,7 @@ 39AEF86E1FB45E1600943FC9 /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558461DBF2E8100A4FC11 /* libsuccinct.a */; }; 39AEF86F1FB45E1600943FC9 /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558441DBF2E7600A4FC11 /* libopening_hours.a */; }; 39AEF8701FB45E1600943FC9 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558421DBF2E6500A4FC11 /* liboauthcpp.a */; }; - 39AEF8711FB45E1600943FC9 /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558401DBF2E4F00A4FC11 /* libcppjansson.a */; }; + 39AEF8711FB45E1600943FC9 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558401DBF2E4F00A4FC11 /* libjansson.a */; }; 39AEF8721FB45E1600943FC9 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F5583E1DBF2E3400A4FC11 /* libpugixml.a */; }; 39AEF8731FB45E1600943FC9 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F5583C1DBF2E2700A4FC11 /* libeditor.a */; }; 39AEF87B1FB45E1600943FC9 /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675346B01A4055CF00A0A8C3 /* libsearch.a */; }; @@ -344,7 +344,7 @@ 34F558381DBF2C8B00A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 34F5583C1DBF2E2700A4FC11 /* libeditor.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeditor.a; path = "../../../omim-xcode-build/Debug/libeditor.a"; sourceTree = ""; }; 34F5583E1DBF2E3400A4FC11 /* libpugixml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml.a; path = "../../../omim-xcode-build/Debug/libpugixml.a"; sourceTree = ""; }; - 34F558401DBF2E4F00A4FC11 /* libcppjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcppjansson.a; path = "../../../omim-xcode-build/Debug/libcppjansson.a"; sourceTree = ""; }; + 34F558401DBF2E4F00A4FC11 /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "../../../omim-xcode-build/Debug/libjansson.a"; sourceTree = ""; }; 34F558421DBF2E6500A4FC11 /* liboauthcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liboauthcpp.a; path = "../../../omim-xcode-build/Debug/liboauthcpp.a"; sourceTree = ""; }; 34F558441DBF2E7600A4FC11 /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = ""; }; 34F558461DBF2E8100A4FC11 /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = ""; }; @@ -539,7 +539,7 @@ 39AEF86F1FB45E1600943FC9 /* libopening_hours.a in Frameworks */, 39AEF8721FB45E1600943FC9 /* libpugixml.a in Frameworks */, 39AEF86E1FB45E1600943FC9 /* libsuccinct.a in Frameworks */, - 39AEF8711FB45E1600943FC9 /* libcppjansson.a in Frameworks */, + 39AEF8711FB45E1600943FC9 /* libjansson.a in Frameworks */, 39B2B96C1FB4633200AB85A1 /* libtess2.a in Frameworks */, 39AEF8701FB45E1600943FC9 /* liboauthcpp.a in Frameworks */, 39B2B96A1FB4631400AB85A1 /* libbsdiff.a in Frameworks */, @@ -570,7 +570,7 @@ 34F558471DBF2E8100A4FC11 /* libsuccinct.a in Frameworks */, 34F558451DBF2E7600A4FC11 /* libopening_hours.a in Frameworks */, 34F558431DBF2E6500A4FC11 /* liboauthcpp.a in Frameworks */, - 34F558411DBF2E4F00A4FC11 /* libcppjansson.a in Frameworks */, + 34F558411DBF2E4F00A4FC11 /* libjansson.a in Frameworks */, 34F5583F1DBF2E3400A4FC11 /* libpugixml.a in Frameworks */, 34F5583D1DBF2E2700A4FC11 /* libeditor.a in Frameworks */, 671C62261AE9232900076BD0 /* libsearch.a in Frameworks */, @@ -646,7 +646,7 @@ 34F558461DBF2E8100A4FC11 /* libsuccinct.a */, 34F558441DBF2E7600A4FC11 /* libopening_hours.a */, 34F558421DBF2E6500A4FC11 /* liboauthcpp.a */, - 34F558401DBF2E4F00A4FC11 /* libcppjansson.a */, + 34F558401DBF2E4F00A4FC11 /* libjansson.a */, 34F5583E1DBF2E3400A4FC11 /* libpugixml.a */, 34F5583C1DBF2E2700A4FC11 /* libeditor.a */, ); @@ -1336,6 +1336,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1344,6 +1345,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj index a57f890661..ec7f248643 100644 --- a/xcode/shaders/shaders.xcodeproj/project.pbxproj +++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj @@ -176,7 +176,7 @@ 45789EE321353CA3009955CC /* program_manager_metal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = program_manager_metal.mm; sourceTree = ""; }; 45789EE52135464D009955CC /* metal_program_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = metal_program_params.hpp; sourceTree = ""; }; 45789EE62135464D009955CC /* metal_program_params.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = metal_program_params.mm; sourceTree = ""; }; - 4598437C21394BE000F8CAB2 /* shaders_metal.metallib */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "archive.metal-library"; path = shaders_metal.metallib; sourceTree = BUILT_PRODUCTS_DIR; }; + 4598437C21394BE000F8CAB2 /* shaders_metal.metallib */ = {isa = PBXFileReference; explicitFileType = "archive.metal-library"; includeInIndex = 0; path = shaders_metal.metallib; sourceTree = BUILT_PRODUCTS_DIR; }; 56DAC3652399214F000BC50D /* libvulkan_wrapper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libvulkan_wrapper.a; sourceTree = BUILT_PRODUCTS_DIR; }; BBF7916F2146D8EC00D27BD8 /* system.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = system.metal; sourceTree = ""; }; BBF7917221493AFC00D27BD8 /* arrow3d.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = arrow3d.metal; sourceTree = ""; }; diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index 813e27ee9e..b660f64881 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -697,6 +697,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -705,6 +706,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/tracking/tracking.xcodeproj/project.pbxproj b/xcode/tracking/tracking.xcodeproj/project.pbxproj index 0d6b8e71b2..64b5e09e86 100644 --- a/xcode/tracking/tracking.xcodeproj/project.pbxproj +++ b/xcode/tracking/tracking.xcodeproj/project.pbxproj @@ -325,6 +325,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -333,6 +334,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/traffic/traffic.xcodeproj/project.pbxproj b/xcode/traffic/traffic.xcodeproj/project.pbxproj index d1007f85d3..0f7d05a1fd 100644 --- a/xcode/traffic/traffic.xcodeproj/project.pbxproj +++ b/xcode/traffic/traffic.xcodeproj/project.pbxproj @@ -301,6 +301,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -309,6 +310,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/transit/transit.xcodeproj/project.pbxproj b/xcode/transit/transit.xcodeproj/project.pbxproj index d2e940dabb..3360869d4f 100644 --- a/xcode/transit/transit.xcodeproj/project.pbxproj +++ b/xcode/transit/transit.xcodeproj/project.pbxproj @@ -211,6 +211,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -219,6 +220,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release;