diff --git a/Make/makerules b/Make/makerules index 4bf7683b4..0c09e2c48 100644 --- a/Make/makerules +++ b/Make/makerules @@ -116,8 +116,8 @@ $(EXEC:=.opt) : @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link -$(LIB:=.opt) : $(PLUGIN:=.opt) - @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) +$(LIB:=.opt) : + @[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR) @cd $(OPTDIR);\ $(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ @@ -125,7 +125,7 @@ $(LIB:=.opt) : $(PLUGIN:=.opt) @$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link $(PLUGIN:=.opt) : - @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) + @[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR) @cd $(OPTDIR); \ $(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ diff --git a/src/Demos/osgproducer/Makefile b/src/Demos/osgproducer/Makefile index a8c5747c2..736ff51b1 100644 --- a/src/Demos/osgproducer/Makefile +++ b/src/Demos/osgproducer/Makefile @@ -5,7 +5,7 @@ CXXFILES =\ osgproducer_viewer.cpp\ # osgproducer_cameragroup.cpp\ -LIBS += -losgProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ @@ -13,5 +13,8 @@ INSTFILES = \ EXEC = osgproducer +CXXFLAGS += $(OSG_INCLUDE_DIR) +LDFLAGS += $(OSG_LIB_DIR) + include $(TOPDIR)/Make/makerules diff --git a/src/Demos/osgproducer/threePipe.cfg b/src/Demos/osgproducer/threePipe.cfg index 213cfeef7..bc1672f93 100644 --- a/src/Demos/osgproducer/threePipe.cfg +++ b/src/Demos/osgproducer/threePipe.cfg @@ -1,4 +1,4 @@ -#define SINGLE_PIPE +//#define SINGLE_PIPE #define ASSYMETRICAL_FRUSTUM Camera "Camera 1" @@ -19,7 +19,7 @@ Camera "Camera 1" }; Offset { #ifdef ASSYMETRICAL_FRUSTUM - Shear 2.0 0.0; + Shear 1.5 0.0; #else Rotate -90.0 1 0 0; Rotate -45.0 0 0 1; @@ -62,7 +62,7 @@ Camera "Camera 3" }; Offset { #ifdef ASSYMETRICAL_FRUSTUM - Shear -2.0 0.0; + Shear -1.5 0.0; #else Rotate -90.0 1 0 0; Rotate 45.0 0 0 1; @@ -74,9 +74,9 @@ Camera "Camera 3" InputArea { - RenderSurface "Window 1" : -1.0 0.0 0.0 1.0; - RenderSurface "Window 2" : 0.0 1.0 0.0 1.0; - RenderSurface "Window 3" : 1.0 2.0 0.0 1.0; + RenderSurface "Window 1" : -2.5 -0.5 -1.0 1.0; + RenderSurface "Window 2" : -1.0 1.0 -1.0 1.0; + RenderSurface "Window 3" : 0.5 2.5 -1.0 1.0; } diff --git a/src/osgProducer/CameraGroup.cpp b/src/osgProducer/CameraGroup.cpp index 8206fe54c..74fa51637 100644 --- a/src/osgProducer/CameraGroup.cpp +++ b/src/osgProducer/CameraGroup.cpp @@ -138,7 +138,7 @@ void CameraGroup::advance() CameraGroup::advance(); } -void CameraGroup::realize( ThreadingModel thread_model= SingleThreaded ) +void CameraGroup::realize( ThreadingModel thread_model) { if( _initialized ) return; diff --git a/src/osgProducer/Makefile b/src/osgProducer/Makefile index 62422aeca..c84924a20 100644 --- a/src/osgProducer/Makefile +++ b/src/osgProducer/Makefile @@ -13,4 +13,7 @@ DEF += -DOSGPRODUCER_LIBRARY TARGET_BASENAME = osgProducer LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) +CXXFLAGS += $(OSG_INCLUDE_DIR) +LDFLAGS += $(OSG_LIB_DIR) + include $(TOPDIR)/Make/makerules diff --git a/src/osgProducer/SceneHandler.cpp b/src/osgProducer/SceneHandler.cpp index 1be113a9b..3b38f9368 100644 --- a/src/osgProducer/SceneHandler.cpp +++ b/src/osgProducer/SceneHandler.cpp @@ -8,7 +8,7 @@ using namespace osgUtil; using namespace osgProducer; -SceneHandler::SceneHandler( osg::DisplaySettings *ds = NULL) : +SceneHandler::SceneHandler( osg::DisplaySettings *ds) : osgUtil::SceneView(ds) { mm = new osg::RefMatrix;