Cleaned up the gdal-config usage to work with gdal-1.1.9

2004-08-04 10:03:57 +00:00
parent b03d3e3a58
commit e59fcfe6ce
2 changed files with 15 additions and 33 deletions
--- a/src/osgPlugins/freetype/GNUmakefile
+++ b/src/osgPlugins/freetype/GNUmakefile
@@ -6,17 +6,10 @@ CXXFILES =\
        FreeTypeFont.cpp\
        ReaderWriterFreeType.cpp\

+INC += $(FREETYPE_INCLUDE)
+
 LIBS   += -losgText $(OSG_LIBS) $(FREETYPE_LIB) $(OTHER_LIBS)

-ifneq ($(OS),HP-UX)
-INC += -I$(OSGHOME)/include \
-    -I/usr/include/freetype2 \
-    -I/usr/local/include \
-    -I/usr/local/include/freetype2  \
-    -I/usr/freeware/include \
-    -I/usr/freeware/include/freetype2
-endif
-INC += $(FREETYPE_INCLUDE)

 TARGET_BASENAME = freetype
 include $(TOPDIR)/Make/cygwin_plugin_def