From d68576c3785572c1f5d41f83015b8fe6bbcbe9e8 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Wed, 30 Mar 2016 17:49:04 +0200
Subject: 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.
---
 Makerules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makerules')

diff --git a/Makerules b/Makerules
index 6fda2f6a..a8257e80 100644
--- a/Makerules
+++ b/Makerules
@@ -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
-- 
cgit v1.2.3