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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

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

8
Make/makedirdefs
View File

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

2
examples/GNUmakefile
View File

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

2
src/GNUmakefile
View File

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