Fixes to makedefs/makedirdefs ordering in some makefiles, and conditional

build for osgslideshow on Sun
This commit is contained in:
Don BURNS 2003-07-26 01:02:39 +00:00
parent 8ff217576a
commit e96c0b735b
4 changed files with 10 additions and 4 deletions

View File

@ -1,6 +1,6 @@
TOPDIR = .
include $(TOPDIR)/Make/makedirdefs
include $(TOPDIR)/Make/makedefs
include $(TOPDIR)/Make/makedirdefs
DIRS = $(TOP_LEVEL_DIRS)

View File

@ -150,12 +150,18 @@ EXAMPLE_DIRS = \
osgvertexprogram\
osgviewer\
osgwindows\
slideshow3D\
# osgpagedlod\
# osgsimulation\
# osgdemeter\
# osgjigsaw\
ifneq ($(OS),SunOS)
# Solaris requires an installation of libxml2
EXAMPLE_DIRS += slideshow3D
endif
# comment in you want to compile the cluster demo.
EXAMPLE_DIRS += osgcluster

View File

@ -1,6 +1,6 @@
TOPDIR = ..
include $(TOPDIR)/Make/makedirdefs
include $(TOPDIR)/Make/makedefs
include $(TOPDIR)/Make/makedirdefs
DIRS = $(EXAMPLE_DIRS)

View File

@ -1,6 +1,6 @@
TOPDIR = ..
include $(TOPDIR)/Make/makedirdefs
include $(TOPDIR)/Make/makedefs
include $(TOPDIR)/Make/makedirdefs
DIRS = $(SRC_DIRS)