From 8d5aa5644db56771b45d4f1560bc9cf90ddf5599 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 18 Aug 2003 10:58:30 +0000 Subject: [PATCH] Added X_INC into the Make/makedefs and changed the *GNUmakefile* to use it. --- Make/makedefs | 8 ++++++++ examples/osganimate/GNUmakefile | 2 +- examples/osganimate/GNUmakefile.inst | 2 +- examples/osgautotransform/GNUmakefile | 2 +- examples/osgautotransform/GNUmakefile.inst | 2 +- examples/osgbillboard/GNUmakefile | 2 +- examples/osgbillboard/GNUmakefile.inst | 2 +- examples/osgcallback/GNUmakefile | 2 +- examples/osgcallback/GNUmakefile.inst | 2 +- examples/osgcameragroup/GNUmakefile | 2 +- examples/osgcameragroup/GNUmakefile.inst | 2 +- examples/osgclip/GNUmakefile | 2 +- examples/osgclip/GNUmakefile.inst | 2 +- examples/osgcluster/GNUmakefile | 2 +- examples/osgcluster/GNUmakefile.inst | 2 +- examples/osgconv/GNUmakefile.inst | 2 +- examples/osgcopy/GNUmakefile | 2 +- examples/osgcopy/GNUmakefile.inst | 2 +- examples/osgcubemap/GNUmakefile | 2 +- examples/osgcubemap/GNUmakefile.inst | 2 +- examples/osgdemeter/GNUmakefile | 2 +- examples/osgdemeter/GNUmakefile.inst | 2 +- examples/osggeodemo/GNUmakefile | 2 +- examples/osggeodemo/GNUmakefile.inst | 2 +- examples/osggeometry/GNUmakefile | 2 +- examples/osggeometry/GNUmakefile.inst | 2 +- examples/osghangglide/GNUmakefile | 2 +- examples/osghangglide/GNUmakefile.inst | 2 +- examples/osghud/GNUmakefile | 2 +- examples/osghud/GNUmakefile.inst | 2 +- examples/osgimpostor/GNUmakefile | 2 +- examples/osgimpostor/GNUmakefile.inst | 2 +- examples/osgkeyboard/GNUmakefile | 2 +- examples/osgkeyboard/GNUmakefile.inst | 2 +- examples/osglight/GNUmakefile | 2 +- examples/osglight/GNUmakefile.inst | 2 +- examples/osglightpoint/GNUmakefile.inst | 2 +- examples/osglogo/GNUmakefile | 2 +- examples/osglogo/GNUmakefile.inst | 2 +- examples/osgmultitexture/GNUmakefile | 2 +- examples/osgmultitexture/GNUmakefile.inst | 2 +- examples/osgoccluder/GNUmakefile | 2 +- examples/osgoccluder/GNUmakefile.inst | 2 +- examples/osgparticle/GNUmakefile | 2 +- examples/osgparticle/GNUmakefile.inst | 2 +- examples/osgpick/GNUmakefile | 2 +- examples/osgpick/GNUmakefile.inst | 2 +- examples/osgpoints/GNUmakefile | 2 +- examples/osgpoints/GNUmakefile.inst | 2 +- examples/osgprerender/GNUmakefile | 2 +- examples/osgprerender/GNUmakefile.inst | 2 +- examples/osgprerendercubemap/GNUmakefile | 2 +- examples/osgprerendercubemap/GNUmakefile.inst | 2 +- examples/osgreflect/GNUmakefile | 2 +- examples/osgreflect/GNUmakefile.inst | 4 ++-- examples/osgscribe/GNUmakefile | 2 +- examples/osgscribe/GNUmakefile.inst | 2 +- examples/osgsequence/GNUmakefile | 2 +- examples/osgsequence/GNUmakefile.inst | 2 +- examples/osgshaders/GNUmakefile | 2 +- examples/osgshaders/GNUmakefile.inst | 2 +- examples/osgshadowtexture/GNUmakefile | 2 +- examples/osgshadowtexture/GNUmakefile.inst | 2 +- examples/osgshape/GNUmakefile | 2 +- examples/osgshape/GNUmakefile.inst | 2 +- examples/osgstereoimage/GNUmakefile | 2 +- examples/osgstereoimage/GNUmakefile.inst | 2 +- examples/osgteapot/GNUmakefile | 2 +- examples/osgteapot/GNUmakefile.inst | 2 +- examples/osgtext/GNUmakefile | 2 +- examples/osgtext/GNUmakefile.inst | 2 +- examples/osgtexture1D/GNUmakefile | 2 +- examples/osgtexture1D/GNUmakefile.inst | 2 +- examples/osgtexture2D/GNUmakefile | 2 +- examples/osgtexture2D/GNUmakefile.inst | 2 +- examples/osgtexture3D/GNUmakefile | 2 +- examples/osgtexture3D/GNUmakefile.inst | 2 +- examples/osgtexturerectangle/GNUmakefile | 2 +- examples/osgtexturerectangle/GNUmakefile.inst | 2 +- examples/osgunittests/GNUmakefile | 2 +- examples/osgunittests/GNUmakefile.inst | 2 +- examples/osgversion/GNUmakefile | 2 +- examples/osgversion/GNUmakefile.inst | 2 +- examples/osgvertexprogram/GNUmakefile | 2 +- examples/osgvertexprogram/GNUmakefile.inst | 2 +- examples/osgviewer/GNUmakefile | 2 +- examples/osgviewer/GNUmakefile.inst | 2 +- examples/osgwindows/GNUmakefile | 2 +- examples/osgwindows/GNUmakefile.inst | 2 +- examples/slideshow3D/GNUmakefile | 2 +- examples/slideshow3D/GNUmakefile.inst | 2 +- src/osgProducer/GNUmakefile | 2 +- 92 files changed, 100 insertions(+), 92 deletions(-) diff --git a/Make/makedefs b/Make/makedefs index de113e965..0626d8bb1 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -193,6 +193,7 @@ ifeq ($(OS),SunOS) DYNAMICLIBRARYLIB = -ldl OSG_LIBS = -losgGA -losgDB -losgUtil -losg GL_LIBS = -lGLU -lGL + X_INC = -I/usr/X11R6/include X_LIBS = -lXext -lXmu -lXi -lX11 SOCKET_LIBS = -lsocket -lnsl INSTBINCMD = cp @@ -239,6 +240,7 @@ ifeq ($(OS),IRIX) DYNAMICLIBRARYLIB = OSG_LIBS = -losgGA -losgDB -losgUtil -losg GL_LIBS = -lGLU -lGL + X_INC = -I/usr/X11R6/include X_LIBS = -lXext -lXi -lXmu -lX11 SOCKET_LIBS = OTHER_LIBS = -lm -lOpenThreads @@ -305,6 +307,7 @@ ifeq ($(OS),Linux) OSG_LIBS = -losgGA -losgDB -losgUtil -losg FREETYPE_LIB = -lfreetype GL_LIBS = -lGLU -lGL + X_INC = -I/usr/X11R6/include X_LIBS = -lXi -lXmu -lX11 PF_XTRA_LIBS = -L/usr/lib/libpfdb -Xlinker -rpath /usr/lib/libpfdb \ -lpfdu -lpfutil -lpf @@ -334,6 +337,7 @@ ifeq ($(OS),FreeBSD) OSG_LIBS = -losgGA -losgDB -losgUtil -losg FREETYPE_LIB = -lfreetype GL_LIBS = -lGLU -lGL + X_INC = -I/usr/X11R6/include X_LIBS = -lXmu -lX11 SOCKET_LIBS = OTHER_LIBS = -lOpenThreads @@ -360,6 +364,7 @@ ifeq ($(OS),Darwin) FREETYPE_LIB = -lfreetype CARBON_LIB = -framework Carbon GL_LIBS = -framework OpenGL $(CARBON_LIB) + X_INC = -I/usr/X11R6/include X_LIBS = -lX11 SOCKET_LIBS = OTHER_LIBS = -lm -lstdc++ -lobjc -lOpenThreads @@ -391,6 +396,7 @@ ifeq ($(OS),CYGWIN) DYNAMICLIBRARYLIB = OSG_LIBS = -losgGA -losgDB -losgUtil -losg GL_LIBS = -lglu32 -lopengl32 + X_INC = X_LIBS = -lgdi32 -luser32 SOCKET_LIBS = OTHER_LIBS = -lOpenThreads @@ -436,6 +442,7 @@ ifeq ($(OS),MINGW) DYNAMICLIBRARYLIB = OSG_LIBS = -losgGA -losgDB -losgUtil -losg GL_LIBS = -lglu32 -lopengl32 + X_INC = X_LIBS = -lgdi32 -luser32 SOCKET_LIBS = OTHER_LIBS = -lOpenThreads @@ -492,6 +499,7 @@ endif DYNAMICLIBRARYLIB = -ldld OSG_LIBS = -losgGA -losgDB -losgUtil -losg GL_LIBS = -L/opt/graphics/OpenGL/lib -lGLU -lGL + X_INC = -I/usr/X11R6/include X_LIBS = -L/usr/lib/X11R6 -lXext -lXi -lX11 -L/usr/lib/X11R4 -lXmu SOCKET_LIBS = # make sure that global constructors/destructors are called upon diff --git a/examples/osganimate/GNUmakefile b/examples/osganimate/GNUmakefile index da9b396b5..e6573d636 100644 --- a/examples/osganimate/GNUmakefile +++ b/examples/osganimate/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osganimate -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osganimate/GNUmakefile.inst b/examples/osganimate/GNUmakefile.inst index 30c785a91..7ab11d650 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgautotransform/GNUmakefile b/examples/osgautotransform/GNUmakefile index 020c00bd6..2e175e505 100644 --- a/examples/osgautotransform/GNUmakefile +++ b/examples/osgautotransform/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgautotransform -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgautotransform/GNUmakefile.inst b/examples/osgautotransform/GNUmakefile.inst index 665e22ee2..708379560 100644 --- a/examples/osgautotransform/GNUmakefile.inst +++ b/examples/osgautotransform/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgText -losgProducer -lProducer -losgDB EXEC = osgautotransform -INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgbillboard/GNUmakefile b/examples/osgbillboard/GNUmakefile index b86027fc5..aa9ba8215 100644 --- a/examples/osgbillboard/GNUmakefile +++ b/examples/osgbillboard/GNUmakefile @@ -13,6 +13,6 @@ INSTFILES = \ EXEC = osgbillboard -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgbillboard/GNUmakefile.inst b/examples/osgbillboard/GNUmakefile.inst index 1f9292b52..6468a9d55 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcallback/GNUmakefile b/examples/osgcallback/GNUmakefile index e4994df16..05a66d0e6 100644 --- a/examples/osgcallback/GNUmakefile +++ b/examples/osgcallback/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgcallback -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcallback/GNUmakefile.inst b/examples/osgcallback/GNUmakefile.inst index 136b2c3a2..ad7e1dc45 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) diff --git a/examples/osgcameragroup/GNUmakefile b/examples/osgcameragroup/GNUmakefile index cf98bdf89..06d68b5a5 100644 --- a/examples/osgcameragroup/GNUmakefile +++ b/examples/osgcameragroup/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgcameragroup -INC += -I/usr/X11R6/include +INC += $(X_INC) LDFLAGS += -L/usr/X11R6/lib diff --git a/examples/osgcameragroup/GNUmakefile.inst b/examples/osgcameragroup/GNUmakefile.inst index 133c971a6..2e91d1eca 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgclip/GNUmakefile b/examples/osgclip/GNUmakefile index 7a9f258b8..a402586e1 100644 --- a/examples/osgclip/GNUmakefile +++ b/examples/osgclip/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgclip -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgclip/GNUmakefile.inst b/examples/osgclip/GNUmakefile.inst index 244f2534d..1cc5d9b12 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcluster/GNUmakefile b/examples/osgcluster/GNUmakefile index 3bafec026..2c861600d 100644 --- a/examples/osgcluster/GNUmakefile +++ b/examples/osgcluster/GNUmakefile @@ -21,6 +21,6 @@ INSTFILES = \ EXEC = osgcluster -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcluster/GNUmakefile.inst b/examples/osgcluster/GNUmakefile.inst index 805659629..a7a1819e8 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgconv/GNUmakefile.inst b/examples/osgconv/GNUmakefile.inst index f6d58795d..5d5860827 100644 --- a/examples/osgconv/GNUmakefile.inst +++ b/examples/osgconv/GNUmakefile.inst @@ -15,7 +15,7 @@ INSTFILES =\ $(CXXFILES)\ Makefile.inst=Makefile -INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcopy/GNUmakefile b/examples/osgcopy/GNUmakefile index 01c3f7ba0..73f95a9fd 100644 --- a/examples/osgcopy/GNUmakefile +++ b/examples/osgcopy/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgcopy -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcopy/GNUmakefile.inst b/examples/osgcopy/GNUmakefile.inst index 41e9c734b..4133f5e04 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcubemap/GNUmakefile b/examples/osgcubemap/GNUmakefile index bce7e89b3..4b21c9cd7 100644 --- a/examples/osgcubemap/GNUmakefile +++ b/examples/osgcubemap/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgcubemap -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgcubemap/GNUmakefile.inst b/examples/osgcubemap/GNUmakefile.inst index 17ff67b64..22f422e5a 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgdemeter/GNUmakefile b/examples/osgdemeter/GNUmakefile index 4372a70a9..68a6309b6 100644 --- a/examples/osgdemeter/GNUmakefile +++ b/examples/osgdemeter/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgdemeter -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgdemeter/GNUmakefile.inst b/examples/osgdemeter/GNUmakefile.inst index fe676374b..9e5e0ac91 100644 --- a/examples/osgdemeter/GNUmakefile.inst +++ b/examples/osgdemeter/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgviewer -INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osggeodemo/GNUmakefile b/examples/osggeodemo/GNUmakefile index 43bfcc18d..2da06c764 100644 --- a/examples/osggeodemo/GNUmakefile +++ b/examples/osggeodemo/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osggeodemo -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osggeodemo/GNUmakefile.inst b/examples/osggeodemo/GNUmakefile.inst index d9c261b77..b69225c1e 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osggeometry/GNUmakefile b/examples/osggeometry/GNUmakefile index 9d3758515..9bfa1e6a4 100644 --- a/examples/osggeometry/GNUmakefile +++ b/examples/osggeometry/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osggeometry -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osggeometry/GNUmakefile.inst b/examples/osggeometry/GNUmakefile.inst index 292a7cf4b..df4e280e2 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osghangglide/GNUmakefile b/examples/osghangglide/GNUmakefile index e3b59ba4e..0029def01 100644 --- a/examples/osghangglide/GNUmakefile +++ b/examples/osghangglide/GNUmakefile @@ -27,6 +27,6 @@ INSTFILES = \ EXEC = osghangglide -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osghangglide/GNUmakefile.inst b/examples/osghangglide/GNUmakefile.inst index a3d389516..04c1ec0a6 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osghud/GNUmakefile b/examples/osghud/GNUmakefile index bf5c8f9d4..c148be77e 100644 --- a/examples/osghud/GNUmakefile +++ b/examples/osghud/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osghud -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osghud/GNUmakefile.inst b/examples/osghud/GNUmakefile.inst index 78ad3f428..4fb84a649 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgimpostor/GNUmakefile b/examples/osgimpostor/GNUmakefile index d9f615e43..450300541 100644 --- a/examples/osgimpostor/GNUmakefile +++ b/examples/osgimpostor/GNUmakefile @@ -13,6 +13,6 @@ INSTFILES = \ EXEC = osgimpostor -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgimpostor/GNUmakefile.inst b/examples/osgimpostor/GNUmakefile.inst index e0571df25..d9af0fca5 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgkeyboard/GNUmakefile b/examples/osgkeyboard/GNUmakefile index 035cba9ce..f7a1be2e6 100644 --- a/examples/osgkeyboard/GNUmakefile +++ b/examples/osgkeyboard/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgkeyboard -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgkeyboard/GNUmakefile.inst b/examples/osgkeyboard/GNUmakefile.inst index b0c33f657..5f4d62fae 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osglight/GNUmakefile b/examples/osglight/GNUmakefile index b64f3aeac..08ced8ddd 100644 --- a/examples/osglight/GNUmakefile +++ b/examples/osglight/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osglight -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osglight/GNUmakefile.inst b/examples/osglight/GNUmakefile.inst index 9fbab4007..89908cb4f 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osglightpoint/GNUmakefile.inst b/examples/osglightpoint/GNUmakefile.inst index 0787dc05d..5faf7c791 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osglogo/GNUmakefile b/examples/osglogo/GNUmakefile index 0365c9d99..fad905852 100644 --- a/examples/osglogo/GNUmakefile +++ b/examples/osglogo/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osglogo -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osglogo/GNUmakefile.inst b/examples/osglogo/GNUmakefile.inst index 6aa0c2154..58a4e13bd 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgmultitexture/GNUmakefile b/examples/osgmultitexture/GNUmakefile index a40df0923..97995efd8 100644 --- a/examples/osgmultitexture/GNUmakefile +++ b/examples/osgmultitexture/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgmultitexture -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgmultitexture/GNUmakefile.inst b/examples/osgmultitexture/GNUmakefile.inst index a1ae89de2..4ccd23f24 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgoccluder/GNUmakefile b/examples/osgoccluder/GNUmakefile index d8309fdfc..2fc5d3735 100644 --- a/examples/osgoccluder/GNUmakefile +++ b/examples/osgoccluder/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgoccluder -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgoccluder/GNUmakefile.inst b/examples/osgoccluder/GNUmakefile.inst index 3ad44a01c..bd0edda40 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgparticle/GNUmakefile b/examples/osgparticle/GNUmakefile index a768bbfce..10d4d4efd 100644 --- a/examples/osgparticle/GNUmakefile +++ b/examples/osgparticle/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgparticle -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgparticle/GNUmakefile.inst b/examples/osgparticle/GNUmakefile.inst index aa55081fe..07067b2a5 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgpick/GNUmakefile b/examples/osgpick/GNUmakefile index 0ad128a4c..95ee439b5 100644 --- a/examples/osgpick/GNUmakefile +++ b/examples/osgpick/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgpick -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgpick/GNUmakefile.inst b/examples/osgpick/GNUmakefile.inst index 3f64ecc73..66937f26f 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgpoints/GNUmakefile b/examples/osgpoints/GNUmakefile index a01715a5a..5e8861938 100644 --- a/examples/osgpoints/GNUmakefile +++ b/examples/osgpoints/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgpoints -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgpoints/GNUmakefile.inst b/examples/osgpoints/GNUmakefile.inst index 8a4961612..fbe914903 100644 --- a/examples/osgpoints/GNUmakefile.inst +++ b/examples/osgpoints/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgpoints -INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgprerender/GNUmakefile b/examples/osgprerender/GNUmakefile index 9b358cd37..5cd5f249a 100644 --- a/examples/osgprerender/GNUmakefile +++ b/examples/osgprerender/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgprerender -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgprerender/GNUmakefile.inst b/examples/osgprerender/GNUmakefile.inst index 0a3f47ae6..29562f5d4 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgprerendercubemap/GNUmakefile b/examples/osgprerendercubemap/GNUmakefile index e02d3a0ea..da8f3b17f 100644 --- a/examples/osgprerendercubemap/GNUmakefile +++ b/examples/osgprerendercubemap/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgprerendercubemap -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgprerendercubemap/GNUmakefile.inst b/examples/osgprerendercubemap/GNUmakefile.inst index 4fd3b5ff3..e30b11ca1 100644 --- a/examples/osgprerendercubemap/GNUmakefile.inst +++ b/examples/osgprerendercubemap/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgprerendercubemap -INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgreflect/GNUmakefile b/examples/osgreflect/GNUmakefile index 94aa12a5d..84c9222ef 100644 --- a/examples/osgreflect/GNUmakefile +++ b/examples/osgreflect/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgreflect -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgreflect/GNUmakefile.inst b/examples/osgreflect/GNUmakefile.inst index b3ef1d7e1..f26cd4dce 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) -INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgscribe/GNUmakefile b/examples/osgscribe/GNUmakefile index 1e8b8d236..8c1d9ad02 100644 --- a/examples/osgscribe/GNUmakefile +++ b/examples/osgscribe/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgscribe -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgscribe/GNUmakefile.inst b/examples/osgscribe/GNUmakefile.inst index 8aa41bafb..f0008c21a 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgsequence/GNUmakefile b/examples/osgsequence/GNUmakefile index c9c4fecb7..0e74b7e3a 100644 --- a/examples/osgsequence/GNUmakefile +++ b/examples/osgsequence/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgsequence -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgsequence/GNUmakefile.inst b/examples/osgsequence/GNUmakefile.inst index 7a108bbe2..b633da38e 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgshaders/GNUmakefile b/examples/osgshaders/GNUmakefile index cb079de3c..2bd193ac6 100644 --- a/examples/osgshaders/GNUmakefile +++ b/examples/osgshaders/GNUmakefile @@ -13,7 +13,7 @@ INSTFILES = \ EXEC = osgshaders -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgshaders/GNUmakefile.inst b/examples/osgshaders/GNUmakefile.inst index e82dc0d04..15718ff59 100644 --- a/examples/osgshaders/GNUmakefile.inst +++ b/examples/osgshaders/GNUmakefile.inst @@ -9,7 +9,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgGL2 -losgUtil -losg EXEC = osgshaders -INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgshadowtexture/GNUmakefile b/examples/osgshadowtexture/GNUmakefile index 7b0a7527b..69ad8fa40 100644 --- a/examples/osgshadowtexture/GNUmakefile +++ b/examples/osgshadowtexture/GNUmakefile @@ -13,6 +13,6 @@ INSTFILES = \ EXEC = osgshadowtexture -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgshadowtexture/GNUmakefile.inst b/examples/osgshadowtexture/GNUmakefile.inst index 91ee8e5eb..8d2865ba0 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgshape/GNUmakefile b/examples/osgshape/GNUmakefile index 821600351..0ee781536 100644 --- a/examples/osgshape/GNUmakefile +++ b/examples/osgshape/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgshape -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgshape/GNUmakefile.inst b/examples/osgshape/GNUmakefile.inst index 5beb2e4d0..67f4cb4fe 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgstereoimage/GNUmakefile b/examples/osgstereoimage/GNUmakefile index 1dd248ccd..0e4440f1d 100644 --- a/examples/osgstereoimage/GNUmakefile +++ b/examples/osgstereoimage/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgstereoimage -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgstereoimage/GNUmakefile.inst b/examples/osgstereoimage/GNUmakefile.inst index 6cee30c3f..fe98a2c10 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) diff --git a/examples/osgteapot/GNUmakefile b/examples/osgteapot/GNUmakefile index 0477abe47..e90dae34a 100644 --- a/examples/osgteapot/GNUmakefile +++ b/examples/osgteapot/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgteapot -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgteapot/GNUmakefile.inst b/examples/osgteapot/GNUmakefile.inst index e7f4a36c2..43e197256 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtext/GNUmakefile b/examples/osgtext/GNUmakefile index 2c9e71b8a..f8104695b 100644 --- a/examples/osgtext/GNUmakefile +++ b/examples/osgtext/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgtext -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtext/GNUmakefile.inst b/examples/osgtext/GNUmakefile.inst index 022246edb..f777ac01e 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture1D/GNUmakefile b/examples/osgtexture1D/GNUmakefile index 14399080d..0c234409f 100644 --- a/examples/osgtexture1D/GNUmakefile +++ b/examples/osgtexture1D/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgtexture1D -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture1D/GNUmakefile.inst b/examples/osgtexture1D/GNUmakefile.inst index ae469353f..79b316520 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture2D/GNUmakefile b/examples/osgtexture2D/GNUmakefile index 839cc127b..cac3fe897 100644 --- a/examples/osgtexture2D/GNUmakefile +++ b/examples/osgtexture2D/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgtexture2D -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture2D/GNUmakefile.inst b/examples/osgtexture2D/GNUmakefile.inst index c675a422c..e23695966 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture3D/GNUmakefile b/examples/osgtexture3D/GNUmakefile index 880a39719..f11e26d22 100644 --- a/examples/osgtexture3D/GNUmakefile +++ b/examples/osgtexture3D/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgtexture3D -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexture3D/GNUmakefile.inst b/examples/osgtexture3D/GNUmakefile.inst index 95f62524e..1f2a80cbf 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexturerectangle/GNUmakefile b/examples/osgtexturerectangle/GNUmakefile index 74bee3411..f8bd146d5 100644 --- a/examples/osgtexturerectangle/GNUmakefile +++ b/examples/osgtexturerectangle/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgtexturerectangle -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgtexturerectangle/GNUmakefile.inst b/examples/osgtexturerectangle/GNUmakefile.inst index a279c9548..7265fd332 100644 --- a/examples/osgtexturerectangle/GNUmakefile.inst +++ b/examples/osgtexturerectangle/GNUmakefile.inst @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS EXEC = osgtexturerectangle -INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgunittests/GNUmakefile b/examples/osgunittests/GNUmakefile index 4db22c51f..c44115315 100644 --- a/examples/osgunittests/GNUmakefile +++ b/examples/osgunittests/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgunittests -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgunittests/GNUmakefile.inst b/examples/osgunittests/GNUmakefile.inst index 72f0e080d..f7a3c8529 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgversion/GNUmakefile b/examples/osgversion/GNUmakefile index 9a171af30..d1c2a056c 100755 --- a/examples/osgversion/GNUmakefile +++ b/examples/osgversion/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgversion -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgversion/GNUmakefile.inst b/examples/osgversion/GNUmakefile.inst index aa76a1853..482d9d332 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgvertexprogram/GNUmakefile b/examples/osgvertexprogram/GNUmakefile index 6e60964a4..5bc584dca 100644 --- a/examples/osgvertexprogram/GNUmakefile +++ b/examples/osgvertexprogram/GNUmakefile @@ -12,6 +12,6 @@ INSTFILES = \ EXEC = osgvertexprogram -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgvertexprogram/GNUmakefile.inst b/examples/osgvertexprogram/GNUmakefile.inst index 8e57cfb18..5fd75ba89 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgviewer/GNUmakefile b/examples/osgviewer/GNUmakefile index 5537a60c0..e6ae462f3 100644 --- a/examples/osgviewer/GNUmakefile +++ b/examples/osgviewer/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgviewer -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgviewer/GNUmakefile.inst b/examples/osgviewer/GNUmakefile.inst index fe676374b..9e5e0ac91 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/osgwindows/GNUmakefile b/examples/osgwindows/GNUmakefile index 9270bc396..2b3f7b8d7 100644 --- a/examples/osgwindows/GNUmakefile +++ b/examples/osgwindows/GNUmakefile @@ -12,7 +12,7 @@ INSTFILES = \ EXEC = osgwindows -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules diff --git a/examples/osgwindows/GNUmakefile.inst b/examples/osgwindows/GNUmakefile.inst index b8ce87d67..a62f3d391 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) -I/usr/X11R6/include +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/examples/slideshow3D/GNUmakefile b/examples/slideshow3D/GNUmakefile index 9b76da302..e8710aa70 100644 --- a/examples/slideshow3D/GNUmakefile +++ b/examples/slideshow3D/GNUmakefile @@ -16,7 +16,7 @@ INSTFILES = \ EXEC = slideshow3D -INC += -I/usr/X11R6/include -I/usr/include/libxml2 +INC += $(X_INC) -I/usr/include/libxml2 include $(TOPDIR)/Make/makerules diff --git a/examples/slideshow3D/GNUmakefile.inst b/examples/slideshow3D/GNUmakefile.inst index 3c4eac5ec..173ecf5db 100644 --- a/examples/slideshow3D/GNUmakefile.inst +++ b/examples/slideshow3D/GNUmakefile.inst @@ -12,7 +12,7 @@ LIBS += -lxml2 -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $( EXEC = slideshow3D -INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include -I/usr/include/libxml2 +INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) -I/usr/include/libxml2 LDFLAGS += $(PRODUCER_LIB_DIR) include $(TOPDIR)/Make/makerules diff --git a/src/osgProducer/GNUmakefile b/src/osgProducer/GNUmakefile index 7a0a9d8ae..2149c86d4 100644 --- a/src/osgProducer/GNUmakefile +++ b/src/osgProducer/GNUmakefile @@ -16,6 +16,6 @@ DEF += -DOSGPRODUCER_LIBRARY TARGET_BASENAME = osgProducer LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) -INC += -I/usr/X11R6/include +INC += $(X_INC) include $(TOPDIR)/Make/makerules