mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #526 from deathbaba/linux-compilation-fix

Browse source 
Removed expat include dependency which caused build error on linux for style_tests.
This commit is contained in:
Viktor Govako 2015-11-13 13:39:14 +03:00
commit 73ab5f4a24
9 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3party/expat/expat_impl.h
View file

@ -35,7 +35,7 @@
//-----------------------------------------------------------------------------
#include <assert.h>
#include <expat.h>
#include "lib/expat.h"
//-----------------------------------------------------------------------------
//

2
coding/coding.pro
View file

@ -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 \

1
drape/drape_common.pri
View file

@ -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 \

2
drape/drape_tests/drape_tests.pro
View file

@ -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"

2
generator/generator.pro
View file

@ -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

2
generator/generator_tests/generator_tests.pro
View file

@ -11,8 +11,6 @@ include($$ROOT_DIR/common.pri)
QT *= core
INCLUDEPATH *= $$ROOT_DIR/3party/expat/lib
HEADERS += \
source_data.hpp \

2
graphics/graphics.pro
View file

@ -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)

2
map/map.pro
View file

@ -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)

2
render/render.pro
View file

@ -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 \