diff --git a/Make/makedefs b/Make/makedefs index b9171b29a..217011ea8 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -349,6 +349,7 @@ ifeq ($(OS),Darwin) OTHER_LIBS = -lm -lstdc++ -lobjc LIB_EXT = dylib QUICKTIME = -framework QuickTime $(CARBON_LIB) + FREETYPE_INCLUDE = -I/sw/include/freetype2 TIFF_LIB = -ltiff LIBVERSION = -dylib_current_version 0.9.3 diff --git a/examples/osganimate/GNUmakefile b/examples/osganimate/GNUmakefile index 6a61d17cb..d37054623 100644 --- a/examples/osganimate/GNUmakefile +++ b/examples/osganimate/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osganimate -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osganimate/GNUmakefile.inst b/examples/osganimate/GNUmakefile.inst index 0b5b6a1c5..30c785a91 100644 --- a/examples/osganimate/GNUmakefile.inst +++ b/examples/osganimate/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osganimate -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgbillboard/GNUmakefile b/examples/osgbillboard/GNUmakefile index f4e59e5d0..414439213 100644 --- a/examples/osgbillboard/GNUmakefile +++ b/examples/osgbillboard/GNUmakefile @@ -13,7 +13,7 @@ INSTFILES = \ EXEC = osgbillboard -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgbillboard/GNUmakefile.inst b/examples/osgbillboard/GNUmakefile.inst index d49429801..1f9292b52 100644 --- a/examples/osgbillboard/GNUmakefile.inst +++ b/examples/osgbillboard/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgbillboard -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcallback/GNUmakefile b/examples/osgcallback/GNUmakefile index ac9e76b99..6ed82ad12 100644 --- a/examples/osgcallback/GNUmakefile +++ b/examples/osgcallback/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgcallback -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcallback/GNUmakefile.inst b/examples/osgcallback/GNUmakefile.inst index 506d0335c..136b2c3a2 100644 --- a/examples/osgcallback/GNUmakefile.inst +++ b/examples/osgcallback/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgcallback -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) diff --git a/examples/osgcameragroup/GNUmakefile b/examples/osgcameragroup/GNUmakefile index cd2933bb3..37e12ff5a 100644 --- a/examples/osgcameragroup/GNUmakefile +++ b/examples/osgcameragroup/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgcameragroup -INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) -L/usr/X11R6/lib include $(TOPDIR)/Make/makerules diff --git a/examples/osgcameragroup/GNUmakefile.inst b/examples/osgcameragroup/GNUmakefile.inst index d5afccf8e..133c971a6 100644 --- a/examples/osgcameragroup/GNUmakefile.inst +++ b/examples/osgcameragroup/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgcameragroup -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgclip/GNUmakefile b/examples/osgclip/GNUmakefile index b04e5186e..f95ecf85a 100644 --- a/examples/osgclip/GNUmakefile +++ b/examples/osgclip/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgclip -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgclip/GNUmakefile.inst b/examples/osgclip/GNUmakefile.inst index 879cde2cb..244f2534d 100644 --- a/examples/osgclip/GNUmakefile.inst +++ b/examples/osgclip/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgclip -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcluster/GNUmakefile b/examples/osgcluster/GNUmakefile index 84b89a1f8..ef7c429d6 100644 --- a/examples/osgcluster/GNUmakefile +++ b/examples/osgcluster/GNUmakefile @@ -21,7 +21,7 @@ INSTFILES = \ EXEC = osgcluster -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcluster/GNUmakefile.inst b/examples/osgcluster/GNUmakefile.inst index 097fe6d1d..805659629 100644 --- a/examples/osgcluster/GNUmakefile.inst +++ b/examples/osgcluster/GNUmakefile.inst @@ -10,7 +10,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgcluster -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgconv/GNUmakefile.inst b/examples/osgconv/GNUmakefile.inst index a164b6a45..1884ddf36 100644 --- a/examples/osgconv/GNUmakefile.inst +++ b/examples/osgconv/GNUmakefile.inst @@ -13,7 +13,7 @@ INSTFILES =\ $(CXXFILES)\ Makefile.inst=Makefile -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcopy/GNUmakefile b/examples/osgcopy/GNUmakefile index 77db1adea..f572dec16 100644 --- a/examples/osgcopy/GNUmakefile +++ b/examples/osgcopy/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgcopy -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcopy/GNUmakefile.inst b/examples/osgcopy/GNUmakefile.inst index 59d660b40..41e9c734b 100644 --- a/examples/osgcopy/GNUmakefile.inst +++ b/examples/osgcopy/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgcopy -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcubemap/GNUmakefile b/examples/osgcubemap/GNUmakefile index 690dfa7c5..2f2cda8a4 100644 --- a/examples/osgcubemap/GNUmakefile +++ b/examples/osgcubemap/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgcubemap -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcubemap/GNUmakefile.inst b/examples/osgcubemap/GNUmakefile.inst index 6d5ba8007..17ff67b64 100644 --- a/examples/osgcubemap/GNUmakefile.inst +++ b/examples/osgcubemap/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgcubemap -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osggeodemo/GNUmakefile b/examples/osggeodemo/GNUmakefile index 4fda2a2d8..227a6665d 100644 --- a/examples/osggeodemo/GNUmakefile +++ b/examples/osggeodemo/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osggeodemo -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osggeodemo/GNUmakefile.inst b/examples/osggeodemo/GNUmakefile.inst index 85243049f..d9c261b77 100644 --- a/examples/osggeodemo/GNUmakefile.inst +++ b/examples/osggeodemo/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osggeomdemo -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osggeometry/GNUmakefile b/examples/osggeometry/GNUmakefile index 974a581c3..92d6ecbba 100644 --- a/examples/osggeometry/GNUmakefile +++ b/examples/osggeometry/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osggeometry -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osggeometry/GNUmakefile.inst b/examples/osggeometry/GNUmakefile.inst index 99a4cb138..292a7cf4b 100644 --- a/examples/osggeometry/GNUmakefile.inst +++ b/examples/osggeometry/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osggeometry -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osghangglide/GNUmakefile b/examples/osghangglide/GNUmakefile index be729c385..c29e06b7e 100644 --- a/examples/osghangglide/GNUmakefile +++ b/examples/osghangglide/GNUmakefile @@ -27,7 +27,7 @@ INSTFILES = \ EXEC = osghangglide -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osghangglide/GNUmakefile.inst b/examples/osghangglide/GNUmakefile.inst index 129726bce..a3d389516 100644 --- a/examples/osghangglide/GNUmakefile.inst +++ b/examples/osghangglide/GNUmakefile.inst @@ -16,7 +16,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osghangglide -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osghud/GNUmakefile b/examples/osghud/GNUmakefile index b6625135a..e0e8955a0 100644 --- a/examples/osghud/GNUmakefile +++ b/examples/osghud/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osghud -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osghud/GNUmakefile.inst b/examples/osghud/GNUmakefile.inst index d4ef8a032..78ad3f428 100644 --- a/examples/osghud/GNUmakefile.inst +++ b/examples/osghud/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgText -losgProducer -lProducer -losgDB EXEC = osghud -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgimpostor/GNUmakefile b/examples/osgimpostor/GNUmakefile index c949146f4..e9ab09a7a 100644 --- a/examples/osgimpostor/GNUmakefile +++ b/examples/osgimpostor/GNUmakefile @@ -13,7 +13,7 @@ INSTFILES = \ EXEC = osgimpostor -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgimpostor/GNUmakefile.inst b/examples/osgimpostor/GNUmakefile.inst index 30fd17b15..e0571df25 100644 --- a/examples/osgimpostor/GNUmakefile.inst +++ b/examples/osgimpostor/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgimpostor -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgkeyboard/GNUmakefile b/examples/osgkeyboard/GNUmakefile index 0d7970372..d89000939 100644 --- a/examples/osgkeyboard/GNUmakefile +++ b/examples/osgkeyboard/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgkeyboard -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgkeyboard/GNUmakefile.inst b/examples/osgkeyboard/GNUmakefile.inst index f4930124b..b0c33f657 100644 --- a/examples/osgkeyboard/GNUmakefile.inst +++ b/examples/osgkeyboard/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgText -losgDB -losgUtil -losg $(GL_LIBS EXEC = osgkeyboard -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osglight/GNUmakefile b/examples/osglight/GNUmakefile index 63c82474e..c8f42339d 100644 --- a/examples/osglight/GNUmakefile +++ b/examples/osglight/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osglight -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osglight/GNUmakefile.inst b/examples/osglight/GNUmakefile.inst index ae2f0c89b..9fbab4007 100644 --- a/examples/osglight/GNUmakefile.inst +++ b/examples/osglight/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osglight -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osglightpoint/GNUmakefile b/examples/osglightpoint/GNUmakefile index 255e6529b..c3a71be54 100644 --- a/examples/osglightpoint/GNUmakefile +++ b/examples/osglightpoint/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osglightpoint -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osglightpoint/GNUmakefile.inst b/examples/osglightpoint/GNUmakefile.inst index 4f20762db..0787dc05d 100644 --- a/examples/osglightpoint/GNUmakefile.inst +++ b/examples/osglightpoint/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgSim -losgProducer -lProducer -losgDB -losgText -losgUtil -losg EXEC = osglightpoint -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osglogo/GNUmakefile b/examples/osglogo/GNUmakefile index e9e794d82..7bbeac234 100644 --- a/examples/osglogo/GNUmakefile +++ b/examples/osglogo/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osglogo -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osglogo/GNUmakefile.inst b/examples/osglogo/GNUmakefile.inst index 28e345d3c..6aa0c2154 100644 --- a/examples/osglogo/GNUmakefile.inst +++ b/examples/osglogo/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgText -losgProducer -lProducer -losgDB -losgText -losgUtil -losg EXEC = osglogo -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgmultitexture/GNUmakefile b/examples/osgmultitexture/GNUmakefile index daabe1a30..94ac15406 100644 --- a/examples/osgmultitexture/GNUmakefile +++ b/examples/osgmultitexture/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgmultitexture -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgmultitexture/GNUmakefile.inst b/examples/osgmultitexture/GNUmakefile.inst index 4b8243dff..a1ae89de2 100644 --- a/examples/osgmultitexture/GNUmakefile.inst +++ b/examples/osgmultitexture/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgmultitexture -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgoccluder/GNUmakefile b/examples/osgoccluder/GNUmakefile index 44adccb12..3b898e168 100644 --- a/examples/osgoccluder/GNUmakefile +++ b/examples/osgoccluder/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgoccluder -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgoccluder/GNUmakefile.inst b/examples/osgoccluder/GNUmakefile.inst index 22515050b..3ad44a01c 100644 --- a/examples/osgoccluder/GNUmakefile.inst +++ b/examples/osgoccluder/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgoccluder -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgparticle/GNUmakefile b/examples/osgparticle/GNUmakefile index f0e1a5437..18bb750db 100644 --- a/examples/osgparticle/GNUmakefile +++ b/examples/osgparticle/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgparticle -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgparticle/GNUmakefile.inst b/examples/osgparticle/GNUmakefile.inst index 6e527e6df..aa55081fe 100644 --- a/examples/osgparticle/GNUmakefile.inst +++ b/examples/osgparticle/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgparticle -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgpick/GNUmakefile b/examples/osgpick/GNUmakefile index 607470a24..054165d57 100644 --- a/examples/osgpick/GNUmakefile +++ b/examples/osgpick/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgpick -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgpick/GNUmakefile.inst b/examples/osgpick/GNUmakefile.inst index 402a95280..3f64ecc73 100644 --- a/examples/osgpick/GNUmakefile.inst +++ b/examples/osgpick/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgpick -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgprerender/GNUmakefile b/examples/osgprerender/GNUmakefile index 8a13e7648..6182a06b9 100644 --- a/examples/osgprerender/GNUmakefile +++ b/examples/osgprerender/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgprerender -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgprerender/GNUmakefile.inst b/examples/osgprerender/GNUmakefile.inst index 7e52691d6..0a3f47ae6 100644 --- a/examples/osgprerender/GNUmakefile.inst +++ b/examples/osgprerender/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgprerender -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgreflect/GNUmakefile b/examples/osgreflect/GNUmakefile index bea07fab2..51daec796 100644 --- a/examples/osgreflect/GNUmakefile +++ b/examples/osgreflect/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgreflect -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgreflect/GNUmakefile.inst b/examples/osgreflect/GNUmakefile.inst index ca9c144f0..b3ef1d7e1 100644 --- a/examples/osgreflect/GNUmakefile.inst +++ b/examples/osgreflect/GNUmakefile.inst @@ -8,11 +8,11 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgviewer -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgscribe/GNUmakefile b/examples/osgscribe/GNUmakefile index 58503508e..16e3a2da2 100644 --- a/examples/osgscribe/GNUmakefile +++ b/examples/osgscribe/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgscribe -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgscribe/GNUmakefile.inst b/examples/osgscribe/GNUmakefile.inst index 61dcd7f8c..8aa41bafb 100644 --- a/examples/osgscribe/GNUmakefile.inst +++ b/examples/osgscribe/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgscribe -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgsequence/GNUmakefile b/examples/osgsequence/GNUmakefile index 9e96936e0..207c7046a 100644 --- a/examples/osgsequence/GNUmakefile +++ b/examples/osgsequence/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgsequence -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgsequence/GNUmakefile.inst b/examples/osgsequence/GNUmakefile.inst index 4d123a21b..7a108bbe2 100644 --- a/examples/osgsequence/GNUmakefile.inst +++ b/examples/osgsequence/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgtexture -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgshadowtexture/GNUmakefile b/examples/osgshadowtexture/GNUmakefile index 9245fa66f..0a111bddc 100644 --- a/examples/osgshadowtexture/GNUmakefile +++ b/examples/osgshadowtexture/GNUmakefile @@ -13,7 +13,7 @@ INSTFILES = \ EXEC = osgshadowtexture -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgshadowtexture/GNUmakefile.inst b/examples/osgshadowtexture/GNUmakefile.inst index fa731ef68..91ee8e5eb 100644 --- a/examples/osgshadowtexture/GNUmakefile.inst +++ b/examples/osgshadowtexture/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgshadowtexture -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgshape/GNUmakefile b/examples/osgshape/GNUmakefile index 588907830..d73505342 100644 --- a/examples/osgshape/GNUmakefile +++ b/examples/osgshape/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgshape -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgshape/GNUmakefile.inst b/examples/osgshape/GNUmakefile.inst index 613d81cbc..5beb2e4d0 100644 --- a/examples/osgshape/GNUmakefile.inst +++ b/examples/osgshape/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgText -losgDB -losgUtil -losg $(GL_LIBS EXEC = osgshape -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgstereoimage/GNUmakefile b/examples/osgstereoimage/GNUmakefile index 7ba61f190..7df712b5f 100644 --- a/examples/osgstereoimage/GNUmakefile +++ b/examples/osgstereoimage/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgstereoimage -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgstereoimage/GNUmakefile.inst b/examples/osgstereoimage/GNUmakefile.inst index 7f811c8bb..6cee30c3f 100644 --- a/examples/osgstereoimage/GNUmakefile.inst +++ b/examples/osgstereoimage/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgText -losgGA -losgDB -losgUtil -losg $ EXEC = osgstereoimage -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) diff --git a/examples/osgteapot/GNUmakefile b/examples/osgteapot/GNUmakefile index a482bda4a..a3d086e66 100644 --- a/examples/osgteapot/GNUmakefile +++ b/examples/osgteapot/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgteapot -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgteapot/GNUmakefile.inst b/examples/osgteapot/GNUmakefile.inst index 4fb31b6a1..e7f4a36c2 100644 --- a/examples/osgteapot/GNUmakefile.inst +++ b/examples/osgteapot/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgcube -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtext/GNUmakefile b/examples/osgtext/GNUmakefile index 12b1cfe73..52c13079e 100644 --- a/examples/osgtext/GNUmakefile +++ b/examples/osgtext/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgtext -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtext/GNUmakefile.inst b/examples/osgtext/GNUmakefile.inst index 42d19d177..022246edb 100644 --- a/examples/osgtext/GNUmakefile.inst +++ b/examples/osgtext/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgText -losgProducer -lProducer -losgDB EXEC = osgtext -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture1D/GNUmakefile b/examples/osgtexture1D/GNUmakefile index 563769093..b61d6e2c6 100644 --- a/examples/osgtexture1D/GNUmakefile +++ b/examples/osgtexture1D/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgtexture1D -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture1D/GNUmakefile.inst b/examples/osgtexture1D/GNUmakefile.inst index c1fe80b68..ae469353f 100644 --- a/examples/osgtexture1D/GNUmakefile.inst +++ b/examples/osgtexture1D/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgText -losgDB -losgText -losgUtil -losg EXEC = osgtexture1D -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture2D/GNUmakefile b/examples/osgtexture2D/GNUmakefile index bc80ef4b1..ed80feb4b 100644 --- a/examples/osgtexture2D/GNUmakefile +++ b/examples/osgtexture2D/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgtexture2D -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture2D/GNUmakefile.inst b/examples/osgtexture2D/GNUmakefile.inst index 785b88d6a..c675a422c 100644 --- a/examples/osgtexture2D/GNUmakefile.inst +++ b/examples/osgtexture2D/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgtexture2D -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture3D/GNUmakefile b/examples/osgtexture3D/GNUmakefile index d93839861..9ab7e2536 100644 --- a/examples/osgtexture3D/GNUmakefile +++ b/examples/osgtexture3D/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgtexture3D -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture3D/GNUmakefile.inst b/examples/osgtexture3D/GNUmakefile.inst index 47c672dc1..95f62524e 100644 --- a/examples/osgtexture3D/GNUmakefile.inst +++ b/examples/osgtexture3D/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgText -losgDB -losgUtil -losg $(GL_LIBS EXEC = osgtexture3D -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgunittests/GNUmakefile b/examples/osgunittests/GNUmakefile index ee6030561..c6d886cc7 100644 --- a/examples/osgunittests/GNUmakefile +++ b/examples/osgunittests/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgunittests -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgunittests/GNUmakefile.inst b/examples/osgunittests/GNUmakefile.inst index 6091e1b35..72f0e080d 100644 --- a/examples/osgunittests/GNUmakefile.inst +++ b/examples/osgunittests/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgText -losgDB -losgUtil -losg $(GL_LIBS EXEC = osgunittests -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgversion/GNUmakefile b/examples/osgversion/GNUmakefile index 1846a3c58..528227634 100755 --- a/examples/osgversion/GNUmakefile +++ b/examples/osgversion/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgversion -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgversion/GNUmakefile.inst b/examples/osgversion/GNUmakefile.inst index 8efe826ef..aa76a1853 100644 --- a/examples/osgversion/GNUmakefile.inst +++ b/examples/osgversion/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgversion -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgvertexprogram/GNUmakefile b/examples/osgvertexprogram/GNUmakefile index 0c531ca7f..766e94a05 100644 --- a/examples/osgvertexprogram/GNUmakefile +++ b/examples/osgvertexprogram/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgvertexprogram -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgvertexprogram/GNUmakefile.inst b/examples/osgvertexprogram/GNUmakefile.inst index acec5e27a..8e57cfb18 100644 --- a/examples/osgvertexprogram/GNUmakefile.inst +++ b/examples/osgvertexprogram/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgvertexprogram -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgviewer/GNUmakefile b/examples/osgviewer/GNUmakefile index 6aefc37e6..9ec5f5958 100644 --- a/examples/osgviewer/GNUmakefile +++ b/examples/osgviewer/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgviewer -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgviewer/GNUmakefile.inst b/examples/osgviewer/GNUmakefile.inst index bdf57808a..fe676374b 100644 --- a/examples/osgviewer/GNUmakefile.inst +++ b/examples/osgviewer/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgviewer -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgwindows/GNUmakefile b/examples/osgwindows/GNUmakefile index 68e17d2a7..3443c1797 100644 --- a/examples/osgwindows/GNUmakefile +++ b/examples/osgwindows/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgwindows -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgwindows/GNUmakefile.inst b/examples/osgwindows/GNUmakefile.inst index 1250d44a1..b8ce87d67 100644 --- a/examples/osgwindows/GNUmakefile.inst +++ b/examples/osgwindows/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgwindows -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/freetype/GNUmakefile b/src/osgPlugins/freetype/GNUmakefile index 8d00b60b7..3ce08ccbf 100644 --- a/src/osgPlugins/freetype/GNUmakefile +++ b/src/osgPlugins/freetype/GNUmakefile @@ -15,12 +15,8 @@ INC += -I$(OSGHOME)/include \ -I/usr/local/include/freetype2 \ -I/usr/freeware/include \ -I/usr/freeware/include/freetype2 - -LINKARGS += -L/usr/local/lib\ - -L/usr/freeware/lib$(ARCH) -else -INC += $(FREETYPE_INCLUDE) endif +INC += $(FREETYPE_INCLUDE) TARGET_BASENAME = freetype include $(TOPDIR)/Make/cygwin_plugin_def diff --git a/src/osgProducer/GNUmakefile b/src/osgProducer/GNUmakefile index ca4fb9dd8..066170fe0 100644 --- a/src/osgProducer/GNUmakefile +++ b/src/osgProducer/GNUmakefile @@ -11,11 +11,11 @@ CXXFILES =\ LIBS += -lProducer $(GL_LIBS) -losgText -losgGA -losgUtil -losgDB -losg $(OTHER_LIBS) DEF += -DOSGPRODUCER_LIBRARY -INC += -I/usr/X11R6/include + TARGET_BASENAME = osgProducer LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) -INC += $(PRODUCER_INCLUDE_DIR) +INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules