Changeset 20341

Show
Ignore:
Timestamp:
06/26/07 17:12:33 (1 year ago)
Author:
patrick
Message:

MFT r20339: Use osg-config correctly. This addresses Ticket #38.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.0/modules/vrjuggler/samples/OpenSG/advanced/OpenSGNavGrab/Makefile.in

    r20217 r20341  
    4747include $(DZR_BASE_DIR)/ext/vrjuggler/dzr.vrjuggler.glapp.mk 
    4848 
    49 OPENSG_LIBS=    $(shell osg-config --libs) -lOSGBase -lOSGSystem 
    50 OPENSG_CFLAGS=  $(shell osg-config --cflags) 
     49OPENSG_LIBS=    $(shell osg-config --libs Base System) 
     50OPENSG_CFLAGS=  $(shell osg-config --cflags Base System) 
    5151#OPENSG_LIBS=   $(shell osg2-config OSGFileIO OSGWindow OSGRenderTraversal --libs) 
    5252#OPENSG_CFLAGS= $(shell osg2-config OSGFileIO OSGWindow OSGRenderTraversal --cflags) 

  • juggler/branches/2.0/modules/vrjuggler/samples/OpenSG/simple/OpenSGNav/Makefile.in

    r20217 r20341  
    4747include $(DZR_BASE_DIR)/ext/vrjuggler/dzr.vrjuggler.glapp.mk 
    4848 
    49 OPENSG_LIBS=    $(shell osg-config --libs) -lOSGBase -lOSGSystem 
    50 OPENSG_CFLAGS=  $(shell osg-config --cflags) 
     49OPENSG_LIBS=    $(shell osg-config --libs Base System) 
     50OPENSG_CFLAGS=  $(shell osg-config --cflags Base System) 
    5151#OPENSG_LIBS=   $(shell osg2-config OSGFileIO OSGWindow OSGRenderTraversal --libs) 
    5252#OPENSG_CFLAGS= $(shell osg2-config OSGFileIO OSGWindow OSGRenderTraversal --cflags)