Changeset 10964

Timestamp:

01/18/10 17:38:07 (3 years ago)

Author:

robert

Message:

Restructure the includes of freetype

Location:

OpenSceneGraph/trunk/src/osgPlugins/freetype

Files:

• CMakeLists.txt (modified) (1 diff)
• FreeTypeFont3D.cpp (modified) (1 diff)
• FreeTypeLibrary.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgPlugins/freetype/CMakeLists.txt

@@ -3 +3 @@
 ENDIF()
 
-INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}/freetype ${FREETYPE_INCLUDE_DIR_freetype2})
 
 IF(APPLE)

OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeFont3D.cpp

@@ -30 +30 @@
 #include FT_FREETYPE_H
 
-#include <freetype/ftoutln.h>
-#include <freetype/ftbbox.h>
+#include <ftoutln.h>
+#include <ftbbox.h>
 
 

OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeLibrary.cpp

@@ -18 +18 @@
 //#define PRINT_OUT_FONT_DETAILS
 #ifdef PRINT_OUT_FONT_DETAILS
-    #include <freetype/ftsnames.h>
+    #include <ftsnames.h>
 #endif