From e5febe10a7dbc3db748eca851d182f07b4d8c252 Mon Sep 17 00:00:00 2001
From: cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Thu, 13 Feb 2014 12:39:00 +0000
Subject: [PATCH] Merge branch releases/1.8 versions 4616 to 4684: - Makefile
 for the new IrrFontTool links now correctly to libfontconfig

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4685 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 changes.txt                            | 5 +++++
 tools/IrrFontTool/newFontTool/Makefile | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes.txt b/changes.txt
index f732ae52..3cb01e0e 100644
--- a/changes.txt
+++ b/changes.txt
@@ -32,6 +32,11 @@ Changes in 1.9 (not yet released)
 - Add IColladaMeshWriter::findGeometryNameForNode
 - Add getters IGUIButton::isDrawBorderEnabled and IGUIButton::isDrawBackgroundEnabled
 
+--------------------------
+Changes in 1.8.2
+
+ - Makefile for the new IrrFontTool links now correctly to libfontconfig
+
 --------------------------
 Changes in 1.8.1 (17.11.2013)
 
diff --git a/tools/IrrFontTool/newFontTool/Makefile b/tools/IrrFontTool/newFontTool/Makefile
index 7444e443..cce91457 100644
--- a/tools/IrrFontTool/newFontTool/Makefile
+++ b/tools/IrrFontTool/newFontTool/Makefile
@@ -17,7 +17,7 @@ LIBSELECT=64
 endif
 
 # target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXft
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXft -lfontconfig
 all_linux clean_linux: SYSTEM=Linux
 all_win32: LDFLAGS = -L../../../lib/Win32-gcc -lIrrlicht -lgdi32 -lopengl32 -lglu32 -lm
 all_win32 clean_win32: SYSTEM=Win32-gcc