diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-03-30 17:49:04 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-03-31 13:00:41 +0200 |
| commit | d68576c3785572c1f5d41f83015b8fe6bbcbe9e8 (patch) | |
| tree | 431a86edfac640864ba7f406611e8fe9929908cd /Makerules | |
| parent | 32cdb2246eeb9e8109a712ec2a5dd2938e30e9b6 (diff) | |
| download | mupdf-d68576c3785572c1f5d41f83015b8fe6bbcbe9e8.tar.xz | |
Reorganize java and android source.
platform/java and platform/android are reorganized:
platform/java
The new JNI Java classes, mupdf_native.{c,h}, Makefile and Makejar.
platform/java/example
The example desktop viewer classes.
platform/android/viewer
The original demo viewer.
ndk-build is used to build libmupdf_java.so,
making reference to mupdf_native.{c,h} in platform/java.
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -67,8 +67,8 @@ SYS_CURL_DEPS = -lpthread SYS_X11_CFLAGS = -I/usr/X11R6/include SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext -SYS_FREETYPE_CFLAGS = -I/usr/X11R6/include/freetype2 -SYS_FREETYPE_LIBS = -lfreetype +SYS_FREETYPE_CFLAGS = $(shell freetype-config --cflags) +SYS_FREETYPE_LIBS = $(shell freetype-config --libs) SYS_OPENJPEG_LIBS = -lopenjpeg SYS_JBIG2DEC_LIBS = -ljbig2dec SYS_JPEG_LIBS = -ljpeg |