FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robert Osfield 2004-08-04 10:03:57 +00:00
parent b03d3e3a58
commit e59fcfe6ce
2 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Make/makedefs
View File

@ -113,8 +113,6 @@ PLUGIN_EXT = so
MAKEDIST = echo " === Distribution build is not implemented yet for $(OS)"; printf "\n"
INSTLOGFILE = /tmp/.osg_inst_log
LIBXML2_INCLUDE = -I/usr/include/libxml2
ifneq ("$(OPENTHREADS_INC_DIR)","")
INC += -I$(OPENTHREADS_INC_DIR)
endif
@ -216,9 +214,8 @@ ifeq ($(OS),SunOS)
FREETYPE_INCLUDE = `freetype-config --cflags`
FREETYPE_LIB = `freetype-config --libs`
GDAL_INCLUDES = -I`gdal-config --prefix`/include
GDAL_LIBS = `gdal-config --dep-libs`
GDAL_LIBS += `gdal-config --libs`
GDAL_INCLUDES = `gdal-config --cflags`
GDAL_LIBS = `gdal-config --libs`
endif
@ -304,9 +301,8 @@ ifeq ($(OS),IRIX)
FREETYPE_INCLUDE = `freetype-config --cflags`
FREETYPE_LIB = `freetype-config --libs`
GDAL_INCLUDES = -I`gdal-config --prefix`/include
GDAL_LIBS = `gdal-config --dep-libs`
GDAL_LIBS += `gdal-config --libs`
GDAL_INCLUDES = `gdal-config --cflags`
GDAL_LIBS = `gdal-config --libs`
endif
@ -389,9 +385,8 @@ ifeq ($(OS),Linux)
FREETYPE_INCLUDE = `freetype-config --cflags`
FREETYPE_LIB = `freetype-config --libs`
GDAL_INCLUDES = -I`gdal-config --prefix`/include
GDAL_LIBS = `gdal-config --dep-libs`
GDAL_LIBS += `gdal-config --libs`
GDAL_INCLUDES = `gdal-config --cflags`
GDAL_LIBS = `gdal-config --libs`
endif
@ -423,9 +418,8 @@ ifeq ($(OS),FreeBSD)
FREETYPE_INCLUDE = `freetype-config --cflags`
FREETYPE_LIB = `freetype-config --libs`
GDAL_INCLUDES = -I`gdal-config --prefix`/include
GDAL_LIBS = `gdal-config --dep-libs`
GDAL_LIBS += `gdal-config --libs`
GDAL_INCLUDES = `gdal-config --cflags`
GDAL_LIBS = `gdal-config --libs`
endif
@ -456,7 +450,6 @@ ifeq ($(OS),Darwin)
SOCKET_LIBS =
OTHER_LIBS = -lm -lstdc++ -lobjc -lOpenThreads
LIB_EXT = dylib
LIBXML2_INCLUDE = -I/usr/include/libxml2 -I/sw/include/libxml2
LIBVERSION = -current_version $(VERSION) \
-compatibility_version \
$(VERSION_MAJOR).$(VERSION_MINOR).0
@ -474,9 +467,8 @@ ifeq ($(OS),Darwin)
FREETYPE_INCLUDE = `freetype-config --cflags`
FREETYPE_LIB = `freetype-config --libs`
GDAL_INCLUDES = -I`gdal-config --prefix`/include
GDAL_LIBS = `gdal-config --dep-libs`
GDAL_LIBS += `gdal-config --libs`
GDAL_INCLUDES = `gdal-config --cflags`
GDAL_LIBS = `gdal-config --libs`
endif
@ -512,7 +504,7 @@ ifeq ($(OS),CYGWIN)
FREETYPE_INCLUDE = `freetype-config --cflags`
FREETYPE_LIB = `freetype-config --libs`
GDAL_INCLUDES = -I`gdal-config --prefix`/include
GDAL_INCLUDES = `gdal-config --cflags`
GDAL_LIBS = `gdal-config --dep-libs`
GDAL_LIBS += `gdal-config --libs`
@ -571,8 +563,6 @@ ifeq ($(OS),MINGW)
GDAL_LIB = -lgdal -ljpeg -lgeotiff -ltiff -lpng -lz
LIBXML2_INCLUDE = -I/usr/mingw/include/libxml2
LIBINST = bin
PLUGININST = bin/$(OS)$(ARCH)
@ -640,9 +630,8 @@ endif
FREETYPE_INCLUDE = `freetype-config --cflags`
FREETYPE_LIB = `freetype-config --libs`
GDAL_INCLUDES = -I`gdal-config --prefix`/include
GDAL_LIBS = `gdal-config --dep-libs`
GDAL_LIBS += `gdal-config --libs`
GDAL_INCLUDES = `gdal-config --cflags`
GDAL_LIBS = `gdal-config --libs`
endif

11
src/osgPlugins/freetype/GNUmakefile
View File

@ -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