From 95793fb556e21269e9f0904b7ffa4dceda791bf9 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Thu, 3 Jan 2013 19:30:00 +0200 Subject: Fix compilation for Android. Change-Id: Ide46bb5104022c5e54a1f2a8bd7822a14bcf603d Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/3rdparty/libtiff.pri | 1 + src/3rdparty/libtiff/libtiff/tif_config.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/libtiff.pri b/src/3rdparty/libtiff.pri index 921b3e6..9e743f0 100644 --- a/src/3rdparty/libtiff.pri +++ b/src/3rdparty/libtiff.pri @@ -38,5 +38,6 @@ wince*: SOURCES += $$PWD/../corelib/kernel/qfunctions_wince.cpp \ $$PWD/libtiff/libtiff/tif_wince.c win32: SOURCES += $$PWD/libtiff/libtiff/tif_win32.c else: SOURCES += $$PWD/libtiff/libtiff/tif_unix.c +android: SOURCES += $$PWD/libtiff/port/lfind.c include($$PWD/zlib_dependency.pri) diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h index f851384..dc579c3 100644 --- a/src/3rdparty/libtiff/libtiff/tif_config.h +++ b/src/3rdparty/libtiff/libtiff/tif_config.h @@ -110,7 +110,7 @@ /* #undef HAVE_PTHREAD */ /* Define to 1 if you have the header file. */ -#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS) +#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS) && !defined(Q_OS_ANDROID) #define HAVE_SEARCH_H 1 #endif -- cgit v1.2.3