diff --git a/3party/expat/expat_impl.h b/3party/expat/expat_impl.h index 2f2c28963d..3a6454a1af 100644 --- a/3party/expat/expat_impl.h +++ b/3party/expat/expat_impl.h @@ -35,7 +35,7 @@ //----------------------------------------------------------------------------- #include -#include +#include "lib/expat.h" //----------------------------------------------------------------------------- // diff --git a/coding/coding.pro b/coding/coding.pro index 6bb665749c..9f8adce637 100644 --- a/coding/coding.pro +++ b/coding/coding.pro @@ -7,7 +7,7 @@ ROOT_DIR = .. include($$ROOT_DIR/common.pri) -INCLUDEPATH *= $$ROOT_DIR/3party/tomcrypt/src/headers $$ROOT_DIR/3party/expat/lib +INCLUDEPATH *= $$ROOT_DIR/3party/tomcrypt/src/headers SOURCES += \ $$ROOT_DIR/3party/lodepng/lodepng.cpp \ diff --git a/drape/drape_common.pri b/drape/drape_common.pri index 54dc8b3e9c..304a0173ad 100644 --- a/drape/drape_common.pri +++ b/drape/drape_common.pri @@ -2,7 +2,6 @@ CMDRES = $$system(python ../tools/autobuild/shader_preprocessor.py $$SHADER_COMP !isEmpty($$CMDRES):message($$CMDRES) INCLUDEPATH *= $$ROOT_DIR/3party/freetype/include -INCLUDEPATH *= $$ROOT_DIR/3party/expat/lib SOURCES += \ $$ROOT_DIR/3party/sdf_image/sdf_image.cpp \ diff --git a/drape/drape_tests/drape_tests.pro b/drape/drape_tests/drape_tests.pro index c39dcce70e..e71a26affa 100644 --- a/drape/drape_tests/drape_tests.pro +++ b/drape/drape_tests/drape_tests.pro @@ -14,7 +14,7 @@ QT *= core gui widgets DRAPE_DIR = .. include($$DRAPE_DIR/drape_common.pri) -INCLUDEPATH *= $$ROOT_DIR/3party/gmock/include $$ROOT_DIR/3party/gmock/gtest/include $$ROOT_DIR/3party/expat/lib +INCLUDEPATH *= $$ROOT_DIR/3party/gmock/include $$ROOT_DIR/3party/gmock/gtest/include macx-* : LIBS *= "-framework CoreLocation" diff --git a/generator/generator.pro b/generator/generator.pro index a5f12ece16..61522b9c90 100644 --- a/generator/generator.pro +++ b/generator/generator.pro @@ -8,7 +8,7 @@ ROOT_DIR = .. include($$ROOT_DIR/common.pri) -INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src $$ROOT_DIR/3party/expat/lib \ +INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src \ $$ROOT_DIR/3party/osrm/osrm-backend/include QT *= core diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro index 67a05f158c..3ba73548c1 100644 --- a/generator/generator_tests/generator_tests.pro +++ b/generator/generator_tests/generator_tests.pro @@ -11,8 +11,6 @@ include($$ROOT_DIR/common.pri) QT *= core -INCLUDEPATH *= $$ROOT_DIR/3party/expat/lib - HEADERS += \ source_data.hpp \ diff --git a/graphics/graphics.pro b/graphics/graphics.pro index a994c39ea4..4ea50e30ea 100644 --- a/graphics/graphics.pro +++ b/graphics/graphics.pro @@ -7,7 +7,7 @@ DEFINES += GRAPHICS_LIBRARY ROOT_DIR = .. -INCLUDEPATH += $$ROOT_DIR/3party/freetype/include $$ROOT_DIR/3party/agg $$ROOT_DIR/3party/expat/lib +INCLUDEPATH += $$ROOT_DIR/3party/freetype/include $$ROOT_DIR/3party/agg include($$ROOT_DIR/common.pri) diff --git a/map/map.pro b/map/map.pro index dabcea1103..e2d32a04c1 100644 --- a/map/map.pro +++ b/map/map.pro @@ -6,7 +6,7 @@ CONFIG += staticlib warn_on ROOT_DIR = .. -INCLUDEPATH *= $$ROOT_DIR/3party/protobuf/src $$ROOT_DIR/3party/expat/lib $$ROOT_DIR/3party/freetype/include +INCLUDEPATH *= $$ROOT_DIR/3party/protobuf/src $$ROOT_DIR/3party/freetype/include include($$ROOT_DIR/common.pri) diff --git a/render/render.pro b/render/render.pro index c7805b616f..5d1a37e8c4 100644 --- a/render/render.pro +++ b/render/render.pro @@ -6,7 +6,7 @@ ROOT_DIR = .. include($$ROOT_DIR/common.pri) -INCLUDEPATH *= $$ROOT_DIR/3party/protobuf/src $$ROOT_DIR/3party/expat/lib $$ROOT_DIR/3party/freetype/include +INCLUDEPATH *= $$ROOT_DIR/3party/protobuf/src $$ROOT_DIR/3party/freetype/include SOURCES += \ $$ROOT_DIR/3party/agg/agg_curves.cpp \