diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2013-11-28 15:07:03 +0100 |
|---|---|---|
| committer | Robin Watts <robin@peeves.(none)> | 2013-11-28 08:10:52 -0800 |
| commit | d0d65fa2d6e1256d011982fe121ad0417e9014ca (patch) | |
| tree | 085626d7c04445386df885ea108428c0cee40d0c /platform/android | |
| parent | 81a97d655e373d7371e70f6a2051a41f606c62dc (diff) | |
| download | mupdf-d0d65fa2d6e1256d011982fe121ad0417e9014ca.tar.xz | |
Put thirdparty config headers in separate directories.
Only -I the config header directory if building the thirdparty library,
not if using the system library.
Fix bug 694808.
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/jni/Core.mk | 4 | ||||
| -rw-r--r-- | platform/android/jni/ThirdParty.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/platform/android/jni/Core.mk b/platform/android/jni/Core.mk index 26d5a629..336d82d9 100644 --- a/platform/android/jni/Core.mk +++ b/platform/android/jni/Core.mk @@ -31,7 +31,9 @@ LOCAL_C_INCLUDES := \ ../../source/xps \ ../../source/cbz \ ../../source/img \ - ../../scripts \ + ../../scripts/freetype \ + ../../scripts/jpeg \ + ../../scripts/openjpeg \ ../../generated \ ../../resources \ ../../include \ diff --git a/platform/android/jni/ThirdParty.mk b/platform/android/jni/ThirdParty.mk index 0092a438..72745494 100644 --- a/platform/android/jni/ThirdParty.mk +++ b/platform/android/jni/ThirdParty.mk @@ -10,7 +10,9 @@ LOCAL_C_INCLUDES := \ ../../thirdparty/jpeg \ ../../thirdparty/zlib \ ../../thirdparty/freetype/include \ - ../../scripts + ../../scripts/freetype \ + ../../scripts/jpeg \ + ../../scripts/openjpeg \ LOCAL_CFLAGS := \ -DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON -DHAVE_STDINT_H \ |