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

[3party] Expat build error fix

Browse source
This commit is contained in:
Alex Zolotarev 2013-07-31 10:37:07 +02:00 • committed by Alex Zolotarev
parent be860e044a
commit 0d3255fc85
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
3party/3party.pro
View file

@ -4,9 +4,8 @@ TEMPLATE = subdirs
SUBDIRS = freetype fribidi zlib bzip2 jansson tomcrypt protobuf
!linux*:android* {
SUBDIRS *= expat
}
# use expat from the system on linux
!linux*: SUBDIRS *= expat
!iphone*:!bada*:!android* {
SUBDIRS += gflags \

5
coding/coding.pro
View file

@ -10,9 +10,8 @@ include($$ROOT_DIR/common.pri)
INCLUDEPATH *= ../3party/tomcrypt/src/headers ../3party/zlib
!linux*:android* {
INCLUDEPATH *= ../3party/expat/lib
}
# use expat from the system on linux
!linux*: INCLUDEPATH *= ../3party/expat/lib
SOURCES += \
internal/file_data.cpp \

3
graphics/graphics.pro
View file

@ -10,6 +10,9 @@ DEPENDENCIES = geometry platform coding base freetype fribidi expat
INCLUDEPATH += $$ROOT_DIR/3party/freetype/include $$ROOT_DIR/3party/agg
# use expat from the system on linux
!linux*: INCLUDEPATH *= ../3party/expat/lib
include($$ROOT_DIR/common.pri)
SOURCES += \

3
map/map.pro
View file

@ -8,6 +8,9 @@ INCLUDEPATH += ../3party/protobuf/src
ROOT_DIR = ..
DEPENDENCIES = search gui graphics indexer anim geometry coding base expat
# use expat from the system on linux
!linux*: INCLUDEPATH *= ../3party/expat/lib
include($$ROOT_DIR/common.pri)
HEADERS += \