Changeset 20339

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

Use osg-config correctly. This addresses Ticket #38.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r20214 r20339  
    4242include $(DZR_BASE_DIR)/ext/vrjuggler/dzr.vrjuggler.glapp.mk 
    4343 
    44 OPENSG_LIBS=    $(shell osg-config --libs) -lOSGBase -lOSGSystem 
    45 OPENSG_CFLAGS=  $(shell osg-config --cflags) 
     44OPENSG_LIBS=    $(shell osg-config --libs Base System) 
     45OPENSG_CFLAGS=  $(shell osg-config --cflags Base System) 
    4646#OPENSG_LIBS=   $(shell osg2-config OSGFileIO OSGWindow OSGRenderTraversal --libs) 
    4747#OPENSG_CFLAGS= $(shell osg2-config OSGFileIO OSGWindow OSGRenderTraversal --cflags) 

  • juggler/trunk/modules/vrjuggler/samples/OpenSG/advanced/OpenSGViewer/Makefile.in

    r19729 r20339  
    4949include $(DZR_BASE_DIR)/ext/vrjuggler/dzr.vrjuggler.glapp.mk 
    5050 
    51 OPENSG_LIBS=    $(shell osg-config --libs) -lOSGBase -lOSGSystem 
    52 OPENSG_CFLAGS=  $(shell osg-config --cflags) 
     51OPENSG_LIBS=    $(shell osg-config --libs Base System) 
     52OPENSG_CFLAGS=  $(shell osg-config --cflags Base System) 
    5353 
    5454EXTRA_CXXFLAGS+=        $(OPENSG_CFLAGS) 

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

    r20214 r20339  
    4242include $(DZR_BASE_DIR)/ext/vrjuggler/dzr.vrjuggler.glapp.mk 
    4343 
    44 OPENSG_LIBS=    $(shell osg-config --libs) -lOSGBase -lOSGSystem 
    45 OPENSG_CFLAGS=  $(shell osg-config --cflags) 
     44OPENSG_LIBS=    $(shell osg-config --libs Base System) 
     45OPENSG_CFLAGS=  $(shell osg-config --cflags Base System) 
    4646#OPENSG_LIBS=   $(shell osg2-config OSGFileIO OSGWindow OSGRenderTraversal --libs) 
    4747#OPENSG_CFLAGS= $(shell osg2-config OSGFileIO OSGWindow OSGRenderTraversal --cflags)