Various changes to the BUILD system:
o Object files now go in subdirectories named $(OS)$(ARCH).Opt and
$(OS)$(ARCH).Debug for OS's that support both architectures.
eg. Linux32.Opt and Linux32.Debug
o Libraries links are now placed in lib/$(OS)$(ARCH)
eg. lib/Linux32/
o Binaries are now placed in bin/$(OS)$(ARCH)
eg. bin/Linux32
o 'make install' and 'make instlinks' now place files/links in
/usr/local/{include,lib,share/OpenSceneGraph} by default on
most systems (Solaris still goes in /opt/OpenSceneGraph).
Rather than having the somwehat confusing INST_SYS_PREFIX and
INST_SHARE_PREFX, you can override these with just
INST_LOCATION
For example,
make INST_LOCATION=/usr
will place files at /usr/include, /usr/lib,
/usr/share/OpenSceneGraph.
This commit is contained in:
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osganimate
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgbillboard
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgcallback
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgclip
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(SOCKET_LIBS) $(OTHER_
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
$(HEADERFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgcluster
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ LIBS += -losg -losgUtil -losgDB $(GL_LIBS) $(OTHER_LIBS)
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
$(HEADERFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgconv
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgcopy
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgcube
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgcubemap
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osggeodemo
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osggeometry
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
$(HEADERFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osghangglide
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ LIBS += -losgText $(OSG_LIBS) -L/usr/local/lib $(FREETYPE_LIB) $(GLUT_LIB) $
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osghud
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgimpostor
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osglight
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += -losgSim $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osglightpoint
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += -losgText $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osglogo
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgmultitexture
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgoccluder
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) -losgPart
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgparticle
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgprerender
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgreflect
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgscribe
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgsequence
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgshadowtexture
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgshape
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgstereoimage
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgteapot
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ LIBS += -losgText $(OSG_LIBS) -L/usr/local/lib $(FREETYPE_LIB) $(GLUT_LIB) $
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgtext
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgtexture1D
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgtexture2D
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgtexture3D
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgunittests
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgversion
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgvertexprogram
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = osgviews
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
INSTFILES = \
|
||||
$(CXXFILES)\
|
||||
Makefile.inst=Makefile
|
||||
GNUmakefile.inst=GNUmakefile
|
||||
|
||||
EXEC = sgv
|
||||
|
||||
|
||||
Reference in New Issue
Block a user