diff options
| -rw-r--r-- | android/jni/Android.mk | 2 | ||||
| -rw-r--r-- | feature_list/feature_list.pro | 2 | ||||
| -rw-r--r-- | generator/feature_segments_checker/feature_segments_checker.pro | 2 | ||||
| -rw-r--r-- | generator/generator_tests/generator_tests.pro | 2 | ||||
| -rw-r--r-- | generator/srtm_coverage_checker/srtm_coverage_checker.pro | 2 | ||||
| -rw-r--r-- | map/benchmark_tool/benchmark_tool.pro | 2 | ||||
| -rw-r--r-- | map/map_tests/map_tests.pro | 2 | ||||
| -rw-r--r-- | map/mwm_tests/mwm_tests.pro | 2 | ||||
| -rw-r--r-- | map/style_tests/style_tests.pro | 2 | ||||
| -rw-r--r-- | mapshot/mapshot.pro | 2 | ||||
| -rw-r--r-- | omim.pro | 2 | ||||
| -rw-r--r-- | qt/qt.pro | 4 | ||||
| -rw-r--r-- | routing/routing_integration_tests/routing_integration_tests.pro | 2 | ||||
| -rw-r--r-- | search/search_quality/features_collector_tool/features_collector_tool.pro | 2 | ||||
| -rw-r--r-- | search/search_quality/search_quality_tool/search_quality_tool.pro | 2 | ||||
| -rw-r--r-- | storage/storage_integration_tests/storage_integration_tests.pro | 2 | ||||
| -rw-r--r-- | ugc/ugc.pro | 16 |
17 files changed, 33 insertions, 17 deletions
diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 8ee01a164b..a50c779c52 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -26,7 +26,7 @@ define add_prebuild_static_lib endef prebuild_static_libs := map tracking routing traffic routing_common drape_frontend search storage -prebuild_static_libs += indexer drape platform editor partners_api local_ads geometry coding base +prebuild_static_libs += ugc indexer drape platform editor partners_api local_ads geometry coding base prebuild_static_libs += opening_hours pugixml oauthcpp expat freetype minizip jansson prebuild_static_libs += protobuf osrm stats_client succinct stb_image sdf_image icu diff --git a/feature_list/feature_list.pro b/feature_list/feature_list.pro index 75d400ce48..8ca87a9611 100644 --- a/feature_list/feature_list.pro +++ b/feature_list/feature_list.pro @@ -1,7 +1,7 @@ # Feature List Tool ROOT_DIR = .. -DEPENDENCIES = map traffic search_tests_support search search_quality storage indexer platform editor geometry \ +DEPENDENCIES = map traffic search_tests_support search search_quality storage ugc indexer platform editor geometry \ coding base jansson protobuf stats_client succinct opening_hours pugixml icu include($$ROOT_DIR/common.pri) diff --git a/generator/feature_segments_checker/feature_segments_checker.pro b/generator/feature_segments_checker/feature_segments_checker.pro index 470c069261..d8a441361a 100644 --- a/generator/feature_segments_checker/feature_segments_checker.pro +++ b/generator/feature_segments_checker/feature_segments_checker.pro @@ -7,7 +7,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = generator map routing traffic routing_common storage indexer \ +DEPENDENCIES = generator map routing traffic routing_common storage ugc indexer \ platform geometry coding base minizip succinct protobuf gflags stats_client icu include($$ROOT_DIR/common.pri) diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro index b5aa569e66..6f9ea74bf0 100644 --- a/generator/generator_tests/generator_tests.pro +++ b/generator/generator_tests/generator_tests.pro @@ -5,7 +5,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = generator_tests_support platform_tests_support generator drape_frontend routing \ - search storage indexer drape map traffic routing_common platform editor geometry \ + search storage ugc indexer drape map traffic routing_common platform editor geometry \ coding base freetype expat jansson protobuf osrm stats_client \ minizip succinct pugixml tess2 gflags oauthcpp stb_image sdf_image icu diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.pro b/generator/srtm_coverage_checker/srtm_coverage_checker.pro index 3f15a6665a..32aa173e5f 100644 --- a/generator/srtm_coverage_checker/srtm_coverage_checker.pro +++ b/generator/srtm_coverage_checker/srtm_coverage_checker.pro @@ -7,7 +7,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = generator map routing routing_common search storage indexer platform editor geometry coding base \ +DEPENDENCIES = generator map routing routing_common search storage ugc indexer platform editor geometry coding base \ osrm jansson protobuf succinct stats_client pugixml minizip gflags stats_client icu include($$ROOT_DIR/common.pri) diff --git a/map/benchmark_tool/benchmark_tool.pro b/map/benchmark_tool/benchmark_tool.pro index 0c0346daed..3a7049deea 100644 --- a/map/benchmark_tool/benchmark_tool.pro +++ b/map/benchmark_tool/benchmark_tool.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map indexer platform editor geometry coding base gflags protobuf succinct pugixml stats_client icu +DEPENDENCIES = map ugc indexer platform editor geometry coding base gflags protobuf succinct pugixml stats_client icu include($$ROOT_DIR/common.pri) diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro index 947cb0ffb0..15a057c11c 100644 --- a/map/map_tests/map_tests.pro +++ b/map/map_tests/map_tests.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = map drape_frontend routing traffic routing_common search storage tracking drape \ - indexer partners_api local_ads platform editor geometry coding base freetype expat \ + ugc indexer partners_api local_ads platform editor geometry coding base freetype expat \ protobuf jansson osrm stats_client minizip succinct pugixml stats_client stb_image sdf_image icu DEPENDENCIES *= opening_hours diff --git a/map/mwm_tests/mwm_tests.pro b/map/mwm_tests/mwm_tests.pro index 46c99eb4c8..8e7df6dc1a 100644 --- a/map/mwm_tests/mwm_tests.pro +++ b/map/mwm_tests/mwm_tests.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map traffic search storage indexer platform editor geometry coding base \ +DEPENDENCIES = map traffic search storage ugc indexer platform editor geometry coding base \ freetype expat protobuf jansson succinct pugixml stats_client icu include($$ROOT_DIR/common.pri) diff --git a/map/style_tests/style_tests.pro b/map/style_tests/style_tests.pro index 550e57a3b5..47aab25910 100644 --- a/map/style_tests/style_tests.pro +++ b/map/style_tests/style_tests.pro @@ -9,7 +9,7 @@ CONFIG += console warn_on INCLUDEPATH += ../../3party/protobuf/src ROOT_DIR = ../.. -DEPENDENCIES = map traffic indexer platform geometry coding base expat protobuf stats_client icu +DEPENDENCIES = map traffic ugc indexer platform geometry coding base expat protobuf stats_client icu macx-*: LIBS *= "-framework IOKit" diff --git a/mapshot/mapshot.pro b/mapshot/mapshot.pro index 3b5c8f172f..2ca6b64693 100644 --- a/mapshot/mapshot.pro +++ b/mapshot/mapshot.pro @@ -1,7 +1,7 @@ # mapshot binary ROOT_DIR = .. -DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common indexer \ +DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common ugc indexer \ drape partners_api local_ads platform editor geometry coding base \ freetype expat gflags jansson protobuf osrm stats_client minizip succinct \ pugixml opening_hours stb_image sdf_image icu @@ -27,7 +27,7 @@ CONFIG(map_designer_standalone) { CONFIG += map_designer } -SUBDIRS = 3party base coding geometry editor indexer routing routing_common search openlr +SUBDIRS = 3party base coding geometry editor ugc indexer routing routing_common search openlr !CONFIG(osrm) { SUBDIRS *= platform stats storage map @@ -1,8 +1,8 @@ # Main application in qt. ROOT_DIR = .. -DEPENDENCIES = qt_common map drape_frontend routing search storage tracking traffic routing_common \ - indexer drape partners_api local_ads platform editor geometry \ +DEPENDENCIES = qt_common map drape_frontend openlr routing search storage tracking traffic routing_common \ + ugc indexer drape partners_api local_ads platform editor geometry \ coding base freetype expat gflags jansson protobuf osrm stats_client \ minizip succinct pugixml oauthcpp stb_image sdf_image icu diff --git a/routing/routing_integration_tests/routing_integration_tests.pro b/routing/routing_integration_tests/routing_integration_tests.pro index 1e1a653331..8d317112e0 100644 --- a/routing/routing_integration_tests/routing_integration_tests.pro +++ b/routing/routing_integration_tests/routing_integration_tests.pro @@ -11,7 +11,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map routing traffic routing_common search storage indexer platform editor geometry coding base \ +DEPENDENCIES = map routing traffic routing_common search storage ugc indexer platform editor geometry coding base \ osrm jansson protobuf succinct stats_client pugixml icu DEPENDENCIES += opening_hours diff --git a/search/search_quality/features_collector_tool/features_collector_tool.pro b/search/search_quality/features_collector_tool/features_collector_tool.pro index 3e7e17063c..1be330db3a 100644 --- a/search/search_quality/features_collector_tool/features_collector_tool.pro +++ b/search/search_quality/features_collector_tool/features_collector_tool.pro @@ -8,7 +8,7 @@ TEMPLATE = app ROOT_DIR = ../../.. # todo(@m) revise DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search search_quality \ - storage indexer drape platform editor geometry coding base freetype expat gflags \ + storage ugc indexer drape platform editor geometry coding base freetype expat gflags \ jansson protobuf osrm stats_client minizip succinct opening_hours pugixml stb_image sdf_image icu include($$ROOT_DIR/common.pri) diff --git a/search/search_quality/search_quality_tool/search_quality_tool.pro b/search/search_quality/search_quality_tool/search_quality_tool.pro index 363a2b6909..89da562c29 100644 --- a/search/search_quality/search_quality_tool/search_quality_tool.pro +++ b/search/search_quality/search_quality_tool/search_quality_tool.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../../.. # todo(@m) revise -DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search search_quality storage indexer drape \ +DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search search_quality storage ugc indexer drape \ platform editor geometry coding base freetype expat gflags \ jansson protobuf osrm stats_client minizip succinct \ opening_hours pugixml stb_image sdf_image icu diff --git a/storage/storage_integration_tests/storage_integration_tests.pro b/storage/storage_integration_tests/storage_integration_tests.pro index b31ea74c4d..2b87fcfed6 100644 --- a/storage/storage_integration_tests/storage_integration_tests.pro +++ b/storage/storage_integration_tests/storage_integration_tests.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common indexer drape \ +DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common ugc indexer drape \ partners_api local_ads platform_tests_support platform editor opening_hours geometry \ coding base freetype expat jansson protobuf osrm stats_client \ minizip succinct pugixml oauthcpp stb_image sdf_image icu diff --git a/ugc/ugc.pro b/ugc/ugc.pro new file mode 100644 index 0000000000..c90196970c --- /dev/null +++ b/ugc/ugc.pro @@ -0,0 +1,16 @@ +# UGC library. + +TARGET = ugc +TEMPLATE = lib +CONFIG += staticlib warn_on + +ROOT_DIR = .. + +include($$ROOT_DIR/common.pri) + +HEADERS += \ + api.hpp \ + types.hpp \ + +SOURCES += \ + api.cpp \ |