diff --git a/console_sloynik/console_sloynik.pro b/console_sloynik/console_sloynik.pro index f29c2f865d..94947fedf8 100644 --- a/console_sloynik/console_sloynik.pro +++ b/console_sloynik/console_sloynik.pro @@ -4,7 +4,7 @@ CONFIG += console CONFIG -= app_bundle ROOT_DIR = .. -DEPENDENCIES = gflags bzip2 zlib base coding words +DEPENDENCIES = words coding base gflags bzip2 zlib include($$ROOT_DIR/common.pri) diff --git a/data/minsk-pass.mwm b/data/minsk-pass.mwm deleted file mode 100644 index 30fb534505..0000000000 Binary files a/data/minsk-pass.mwm and /dev/null differ diff --git a/omim.pro b/omim.pro index 25d14e373f..bbdd834431 100644 --- a/omim.pro +++ b/omim.pro @@ -25,8 +25,8 @@ SUBDIRS = 3party \ qt_tstfrm \ indexer/indexer_tests \ yg/yg_tests \ - qt \ words words/words_tests \ + qt \ publisher publisher/publisher_tests \ console_sloynik } else { diff --git a/publisher/publisher.pro b/publisher/publisher.pro index 5480e5cf8a..0ef9f6ae4b 100644 --- a/publisher/publisher.pro +++ b/publisher/publisher.pro @@ -4,7 +4,7 @@ CONFIG += console CONFIG -= app_bundle ROOT_DIR = .. -DEPENDENCIES = gflags bzip2 zlib jansson base coding words +DEPENDENCIES = words coding base gflags bzip2 zlib jansson include($$ROOT_DIR/common.pri) diff --git a/publisher/publisher_tests/publisher_tests.pro b/publisher/publisher_tests/publisher_tests.pro index fb2784cd3a..4d2ff578f2 100644 --- a/publisher/publisher_tests/publisher_tests.pro +++ b/publisher/publisher_tests/publisher_tests.pro @@ -4,7 +4,7 @@ CONFIG += console CONFIG -= app_bundle ROOT_DIR = ../.. -DEPENDENCIES = gflags bzip2 zlib base coding words +DEPENDENCIES = words coding base bzip2 zlib include($$ROOT_DIR/common.pri) diff --git a/words/words.pro b/words/words.pro index e5e02b172f..19994272db 100644 --- a/words/words.pro +++ b/words/words.pro @@ -3,7 +3,7 @@ TEMPLATE = lib CONFIG += staticlib ROOT_DIR = .. -DEPENDENCIES = bzip2 zlib base coding +DEPENDENCIES = coding base zlib bzip2 include($$ROOT_DIR/common.pri) diff --git a/words/words_tests/sorted_index_test.cpp b/words/words_tests/sorted_index_test.cpp index 65c03448db..de5d8db8a0 100644 --- a/words/words_tests/sorted_index_test.cpp +++ b/words/words_tests/sorted_index_test.cpp @@ -7,6 +7,7 @@ #include "../../std/set.hpp" #include "../../std/string.hpp" #include "../../std/vector.hpp" +#include "../../std/stdio.hpp" namespace { diff --git a/words/words_tests/words_tests.pro b/words/words_tests/words_tests.pro index 069186b771..3056ec2749 100644 --- a/words/words_tests/words_tests.pro +++ b/words/words_tests/words_tests.pro @@ -4,7 +4,7 @@ CONFIG += console CONFIG -= app_bundle ROOT_DIR = ../.. -DEPENDENCIES = bzip2 zlib base coding words +DEPENDENCIES = words coding base zlib bzip2 include($$ROOT_DIR/common.pri)