diff --git a/3party/3party.pro b/3party/3party.pro index 19628ada69..af69765182 100644 --- a/3party/3party.pro +++ b/3party/3party.pro @@ -3,6 +3,7 @@ TEMPLATE = subdirs SUBDIRS = freetype fribidi zlib bzip2 jansson tomcrypt protobuf osrm expat \ + succinct !iphone*:!tizen*:!android* { SUBDIRS += gflags \ diff --git a/3party/succinct/succinct.pro b/3party/succinct/succinct.pro new file mode 100644 index 0000000000..fa81d2917e --- /dev/null +++ b/3party/succinct/succinct.pro @@ -0,0 +1,40 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2015-02-26T15:21:15 +# +#------------------------------------------------- + +TARGET = succinct + +ROOT_DIR = ../.. +include($$ROOT_DIR/common.pri) + +TEMPLATE = lib +CONFIG += staticlib + +SOURCES += \ + bp_vector.cpp \ + rs_bit_vector.cpp + +HEADERS += \ + bit_vector.hpp \ + bp_vector.hpp \ + broadword.hpp \ + cartesian_tree.hpp \ + darray.hpp \ + darray64.hpp \ + elias_fano_compressed_list.hpp \ + elias_fano_list.hpp \ + elias_fano.hpp \ + forward_enumerator.hpp \ + gamma_bit_vector.hpp \ + gamma_vector.hpp \ + intrinsics.hpp \ + mappable_vector.hpp \ + mapper.hpp \ + nibble_vector.hpp \ + rs_bit_vector.hpp \ + tables.hpp \ + topk_vector.hpp \ + util.hpp \ + vbyte.hpp diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro index 03959e6ab2..765f2f345c 100644 --- a/generator/generator_tests/generator_tests.pro +++ b/generator/generator_tests/generator_tests.pro @@ -4,7 +4,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = generator map routing indexer platform geometry coding base expat sgitess protobuf tomcrypt osrm +DEPENDENCIES = generator map routing indexer platform geometry coding base expat sgitess protobuf tomcrypt osrm succinct include($$ROOT_DIR/common.pri) diff --git a/integration_tests/integration_tests.pro b/integration_tests/integration_tests.pro index 5babe1bf5e..ab342e45ea 100644 --- a/integration_tests/integration_tests.pro +++ b/integration_tests/integration_tests.pro @@ -11,7 +11,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../ -DEPENDENCIES = map routing search storage indexer platform geometry coding base osrm jansson protobuf tomcrypt +DEPENDENCIES = map routing search storage indexer platform geometry coding base osrm jansson protobuf tomcrypt succinct macx-*: LIBS *= "-framework Foundation" "-framework IOKit" diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro index 1968bb8e1d..0ad19421ee 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 gui routing search storage graphics indexer platform anim geometry coding base \ - freetype fribidi expat protobuf tomcrypt jansson zlib osrm stats_client + freetype fribidi expat protobuf tomcrypt jansson zlib osrm stats_client succinct drape { DEPENDENCIES *= drape_frontend drape diff --git a/map_server/map_server.pro b/map_server/map_server.pro index a29f9b41c0..4e12cd4745 100644 --- a/map_server/map_server.pro +++ b/map_server/map_server.pro @@ -6,7 +6,7 @@ TEMPLATE = app DEFINES += QJSONRPC_BUILD DEPENDENCIES = map gui routing search storage indexer graphics platform anim geometry coding base \ - osrm bzip2 freetype expat fribidi tomcrypt jansson protobuf qjsonrpc gflags zlib stats_client + osrm bzip2 freetype expat fribidi tomcrypt jansson protobuf qjsonrpc gflags zlib stats_client succinct drape { DEPENDENCIES *= drape_frontend drape diff --git a/qt/qt.pro b/qt/qt.pro index 9d30d2d11f..b4827c149e 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -1,7 +1,7 @@ # Main application in qt. ROOT_DIR = .. DEPENDENCIES = map gui routing search storage indexer graphics platform anim geometry coding base \ - bzip2 freetype expat fribidi tomcrypt jansson protobuf zlib osrm stats_client + bzip2 freetype expat fribidi tomcrypt jansson protobuf zlib osrm stats_client succinct drape { DEPENDENCIES *= drape_frontend drape diff --git a/routing/routing_tests/routing_tests.pro b/routing/routing_tests/routing_tests.pro index 2a3e06618a..ebd3737c70 100644 --- a/routing/routing_tests/routing_tests.pro +++ b/routing/routing_tests/routing_tests.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = routing indexer platform geometry coding base osrm protobuf tomcrypt +DEPENDENCIES = routing indexer platform geometry coding base osrm protobuf tomcrypt succinct macx-*: LIBS *= "-framework Foundation" "-framework IOKit"