From 16e48d172425b9e52d09729598b9acccde106a40 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 22 Jan 2010 16:13:28 +0000
Subject: [PATCH] Reverted fixes for Mingw as they break OSX build

---
 src/osgPlugins/freetype/CMakeLists.txt      | 2 +-
 src/osgPlugins/freetype/FreeTypeFont3D.cpp  | 4 ++--
 src/osgPlugins/freetype/FreeTypeLibrary.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/osgPlugins/freetype/CMakeLists.txt b/src/osgPlugins/freetype/CMakeLists.txt
index ea07d09f7..72d5463f3 100644
--- a/src/osgPlugins/freetype/CMakeLists.txt
+++ b/src/osgPlugins/freetype/CMakeLists.txt
@@ -2,7 +2,7 @@ IF(WIN32)
     SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
 ENDIF()
 
-INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}/freetype ${FREETYPE_INCLUDE_DIR_freetype2})
+INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} )
 
 IF(APPLE)
   SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
diff --git a/src/osgPlugins/freetype/FreeTypeFont3D.cpp b/src/osgPlugins/freetype/FreeTypeFont3D.cpp
index 53bed10e3..04414bc82 100644
--- a/src/osgPlugins/freetype/FreeTypeFont3D.cpp
+++ b/src/osgPlugins/freetype/FreeTypeFont3D.cpp
@@ -29,8 +29,8 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include <ftoutln.h>
-#include <ftbbox.h>
+#include <freetype/ftoutln.h>
+#include <freetype/ftbbox.h>
 
 
 
diff --git a/src/osgPlugins/freetype/FreeTypeLibrary.cpp b/src/osgPlugins/freetype/FreeTypeLibrary.cpp
index f43cd97ab..55b2b40dc 100644
--- a/src/osgPlugins/freetype/FreeTypeLibrary.cpp
+++ b/src/osgPlugins/freetype/FreeTypeLibrary.cpp
@@ -17,7 +17,7 @@
 
 //#define PRINT_OUT_FONT_DETAILS
 #ifdef PRINT_OUT_FONT_DETAILS
-    #include <ftsnames.h>
+    #include <freetype/ftsnames.h>
 #endif
 
 #include FT_TRUETYPE_IDS_H