Changeset 27

Show
Ignore:
Timestamp:
02/14/07 15:27:15 (2 years ago)
Author:
astraw
Message:

changes to build under OSG 1.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/brutal-hackjob-for-OSG1.2/pyosg/PyOSG.egg-info/stdeb.cfg

    r22 r27  
    11# configuration file for stdeb http://stdeb.python-hosting.com/ 
    22[PyOSG] 
    3 Build-Depends: libboost-python-dev, libopenscenegraph-dev (>= 1.0) 
     3Build-Depends: libboost-python-dev, libopenscenegraph-dev (>= 1.0), libglu-dev 
  • branches/brutal-hackjob-for-OSG1.2/pyosg/include/held_ptr.hpp

    r26 r27  
    3535 
    3636  // XXX need to check when this was added to OSG 
    37 #if ((OSG_VERSION_MAJOR==1) & (OSG_VERSION_MINOR < 2)) 
     37#if ((OSG_VERSION_MAJOR==1) & (OSG_VERSION_MINOR < 1)) 
    3838template<class T> inline T * get_pointer(osg::ref_ptr<T> const & p) 
    3939{ 
  • branches/brutal-hackjob-for-OSG1.2/pyosg/osg/LOD.cpp

    r26 r27  
    6161         .def("addChild", (bool (LOD::*)(Node *, float, float)) &LOD::addChild) 
    6262 
    63 #if ((OSG_VERSION_MAJOR==1) & (OSG_VERSION_MINOR < 2)) 
     63#if ((OSG_VERSION_MAJOR==1) & (OSG_VERSION_MINOR < 1)) 
    6464         .def("removeChild", &LOD::removeChild) 
    6565#else 
  • branches/brutal-hackjob-for-OSG1.2/pyosg/osg/StateSet.cpp

    r26 r27  
    133133    OSG_ENUM_MODE(USE_RENDERBIN_DETAILS); 
    134134    OSG_ENUM_MODE(OVERRIDE_RENDERBIN_DETAILS); 
    135 #if ((OSG_VERSION_MAJOR==1) & (OSG_VERSION_MINOR < 2)) 
     135#if ((OSG_VERSION_MAJOR==1) & (OSG_VERSION_MINOR < 1)) 
    136136    OSG_ENUM_MODE(ENCLOSE_RENDERBIN_DETAILS); 
    137137#endif 
  • branches/brutal-hackjob-for-OSG1.2/pyosg/osgSim/OverlayNode.cpp

    r26 r27  
    4646    /** Inform the OverlayNode that the overlay texture needs to be updated.*/ 
    4747 
    48 #if ((OSG_VERSION_MAJOR==1) & (OSG_VERSION_MINOR < 2)) 
     48#if ((OSG_VERSION_MAJOR==1) & (OSG_VERSION_MINOR < 1)) 
    4949    overlaynode.def("setContinousUpdate", 
    5050        &osgSim::OverlayNode::setContinousUpdate);