From 1f12087c1887ac3a4f0f8c6acef322ea9a368302 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 10 Jul 2015 06:30:20 +0200
Subject: [PATCH] Fix freetype include order WINSDK added a fttypes.h header...

---
 code/nel/src/3d/CMakeLists.txt    | 3 ++-
 code/nel/src/cegui/CMakeLists.txt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt
index 21184eb12..0082c22d5 100644
--- a/code/nel/src/3d/CMakeLists.txt
+++ b/code/nel/src/3d/CMakeLists.txt
@@ -715,7 +715,8 @@ SOURCE_GROUP(Stereo FILES
 
 NL_TARGET_LIB(nel3d ${HEADERS} ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${LIBOVR_INCLUDE_DIR} ${LIBVR_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${FREETYPE_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LIBOVR_INCLUDE_DIR} ${LIBVR_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARIES} ${LIBOVR_LIBRARIES} ${LIBVR_LIBRARY})
 SET_TARGET_PROPERTIES(nel3d PROPERTIES LINK_INTERFACE_LIBRARIES "")
diff --git a/code/nel/src/cegui/CMakeLists.txt b/code/nel/src/cegui/CMakeLists.txt
index b815eb139..20fbb60d8 100644
--- a/code/nel/src/cegui/CMakeLists.txt
+++ b/code/nel/src/cegui/CMakeLists.txt
@@ -3,7 +3,8 @@ FILE(GLOB HEADERS ../../include/nel/cegui/*.h)
 
 ADD_LIBRARY(nelceguirenderer SHARED ${HEADERS} ${SRC} nelceguirenderer.def)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INC} ${CEGUI_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(BEFORE ${FREETYPE_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CEGUI_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(nelceguirenderer nelmisc nel3d ${CEGUI_LIBRARY})
 NL_DEFAULT_PROPS(nelceguirenderer "NeL, Library: CEGUI Renderer")
 NL_ADD_RUNTIME_FLAGS(nelceguirenderer)