Changeset 19621

Show
Ignore:
Timestamp:
12/10/06 14:05:28 (2 years ago)
Author:
patrick
Message:

MFT [rev 19613]: Added untested bindings for vrj::OpenSGApp so that PyJuggler?

and PyOpenSG can be combined.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • PyJuggler/branches/1.0/ChangeLog

    r19618 r19621  
    11DATE        AUTHOR      CHANGE 
    22----------- ----------- ------------------------------------------------------- 
     3Dec-10-2006 patrick     Exposed vrj::OpenSGApp so that developers can combine 
     4                        PyJuggler and PyOpenSG. 
    35Dec-10-2006 patrick     Added bindings for methods added in Gadgeteer 1.0.2. 
    46Nov-10-2006 patrick     Handle 64-bit installations of Open Scene Graph. 

  • PyJuggler/branches/1.0/configure.ac

    r19618 r19621  
    5555            [  --with-osg=<PATH>       Open Scene Graph installation   [default=$OSGHOME then /usr/local]], 
    5656            [osg_base_dir="$withval"], [osg_base_dir=${OSGHOME-/usr/local}]) 
     57 
     58AC_ARG_WITH([opensg], 
     59            [  --with-opensg=<PATH>    OpenSG installation             [default=$OSGROOT then /usr/local]], 
     60            [opensg_base_dir="$withval"], 
     61            [opensg_base_dir=${OSGROOT-/usr/local}]) 
    5762 
    5863# Force the use of GCC as the compiler. 
    …… 
    513518fi 
    514519 
     520HAVE_OPENSG='N' 
     521 
     522if test "x$opensg_base_dir" != "xno" ; then 
     523   AC_PATH_PROG(OPENSG_CONFIG, osg-config, no, [$opensg_base_dir/bin:$PATH]) 
     524 
     525   if test "x$OPENSG_CONFIG" != "xno" ; then 
     526      opensg_pkgs='Base System' 
     527      OPENSG_INCLUDES=`$OPENSG_CONFIG --opt --cflags $opensg_pkgs` 
     528      OPENSG_LDFLAGS=`$OPENSG_CONFIG --opt --lflags $opensg_pkgs` 
     529      OPENSG_LIBS=`$OPENSG_CONFIG --opt --libs $opensg_pkgs` 
     530      HAVE_OPENSG='Y' 
     531   fi 
     532fi 
     533 
    515534# ----------------------------------------------------------------------------- 
    516535# Miscellaneous checks. 
    …… 
    551570AC_SUBST(OSG_LDFLAGS) 
    552571AC_SUBST(OSG_LIBS) 
     572 
     573AC_SUBST(HAVE_OPENSG) 
     574AC_SUBST(OPENSG_INCLUDES) 
     575AC_SUBST(OPENSG_LDFLAGS) 
     576AC_SUBST(OPENSG_LIBS) 
    553577 
    554578AC_SUBST(PYTHON_ROOT) 
    …… 
    583607                 src/jccl/Makefile 
    584608                 src/osgapp/Makefile 
     609                 src/opensgapp/Makefile 
    585610                 src/snx/Makefile 
    586611                 src/vpr/Makefile 

  • PyJuggler/branches/1.0/src/Makefile.in

    r18527 r19621  
    99ifeq (@HAVE_OSG@, Y) 
    1010DIRS+=  osgapp 
     11endif 
     12 
     13ifeq (@HAVE_OPENSG@, Y) 
     14DIRS+=  opensgapp 
    1115endif 
    1216