FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Daniel Trstenjak, build fixes for Hpux 11.11, Irix 6.5, Solaris 8 and Aix

Browse Source
This commit is contained in:
Robert Osfield 2006-08-02 10:43:26 +00:00
parent 91081a0ad7
commit 553d017fd9
17 changed files with 90 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Make/makedefs
View File

@ -233,6 +233,8 @@ endif
#### IRIX Specific definitions
ifeq ($(OS),IRIX)
INSTBINCMD = cp
INSTDEVCMD = cp
CXX = CC
ifeq ($(CXX),CC)
LINKARGS = -L${TOPDIR}/$(LIBINST) -LANG:std -OPT:Olimit=0
@ -725,6 +727,52 @@ ifeq ($(OS),HP-UX)
GDAL_INCLUDES = `gdal-config --cflags`
GDAL_LIBS = `gdal-config --libs`
INSTXCMD = install -c -m 755
INSTRCMD = install -c -m 644
INSTBINCMD = install -c -m 755
INSTDEVCMD = install -c -m 644
endif
ifeq ($(OS),AIX)
CXX = g++
C++ = $(CXX)
DEPARG = -M
INC +=
DEF +=
OPTF = -O
DBGF = -g
SHARED =
ARCH = 32
LDFLAGS +=
LINKARGS = -lpthread
LIB_EXT = sl
PLUGIN_EXT = sl
DYNAMICLIBRARYLIB = -ldld
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
GL_LIBS = -lGLU -lGL
X_INC =
X_LIBS = -lXext -lXi -lX11
SOCKET_LIBS =
OTHER_LIBS = -lm -lOpenThreads
PNG_INCLUDE = -I/usr/local/include/libpng -I/usr/local/include/
PNG_LIBS = -L/usr/local/lib -lpng -lz
JPEG_INCLUDE = -I/usr/local/include
JPEG_LIBS = -L/usr/local/lib -ljpeg
TIFF_INCLUDE = -I/usr/local/include
TIFF_LIB = -L/usr/local/lib -ltiff
GIF_INCLUDE = -I/opt/libungif/include
GIF_LIBS = -L/opt/libungif/lib -lungif
FREETYPE_INCLUDE = `freetype-config --cflags`
FREETYPE_LIB = `freetype-config --libs`
GDAL_INCLUDES = `gdal-config --cflags`
GDAL_LIBS = `gdal-config --libs`
endif

2
include/osg/GLU
View File

@ -14,7 +14,7 @@
#ifndef OSG_GLU
#define OSG_GLU 1
#ifdef __APPLE__
#if defined(__APPLE__) || defined (_AIX)
#include <OpenGL/glu.h>
#define GLU_TESS_CALLBACK GLvoid (CALLBACK*)(...)
#else

8
include/osg/Math
View File

@ -84,6 +84,10 @@
inline float atan2f(float value1, float value2) { return static_cast<float>(atan2(value1,value2)); }
#endif
#ifndef tanf
inline float tanf(float value) { return static_cast<float>(tan(value)); }
#endif
#endif
@ -95,6 +99,10 @@
inline float floorf(float value) { return static_cast<float>(floor(value)); }
#endif
#ifndef ceilf
inline float ceilf(float value) { return static_cast<float>(ceil(value)); }
#endif
#endif
namespace osg {

8
include/osg/NodeTrackerCallback
View File

@ -28,7 +28,13 @@ class OSG_EXPORT NodeTrackerCallback : public NodeCallback
typedef std::vector< observer_ptr<Node> > ObserveredNodePath;
void setTrackNodePath(const osg::NodePath& nodePath) { _trackNodePath.clear(); _trackNodePath.insert(_trackNodePath.begin(), nodePath.begin(),nodePath.end()); }
void setTrackNodePath(const osg::NodePath& nodePath)
{
_trackNodePath.clear();
_trackNodePath.reserve(nodePath.size());
std::copy(nodePath.begin(), nodePath.end(), std::back_inserter(_trackNodePath));
}
void setTrackNodePath(const ObserveredNodePath& nodePath) { _trackNodePath = nodePath; }
ObserveredNodePath& getTrackNodePath() { return _trackNodePath; }

5
include/osg/Texture
View File

@ -160,8 +160,11 @@
#define GL_TEXTURE_BINDING_3D 0x806A
#endif
#ifndef GL_TEXTURE_COMPARE_MODE_ARB
#ifndef GL_DEPTH_TEXTURE_MODE_ARB
#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B
#endif
#ifndef GL_TEXTURE_COMPARE_MODE_ARB
#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C
#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D
#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E

1
include/osgDB/ReaderWriter
View File

@ -22,6 +22,7 @@
#include <osgDB/Export>
#include <deque>
#include <iosfwd>
namespace osgDB {

8
include/osgGA/NodeTrackerManipulator
View File

@ -31,7 +31,13 @@ class OSGGA_EXPORT NodeTrackerManipulator : public MatrixManipulator
typedef std::vector< osg::observer_ptr<osg::Node> > ObserveredNodePath;
void setTrackNodePath(const osg::NodePath& nodePath) { _trackNodePath.clear(); _trackNodePath.insert(_trackNodePath.begin(), nodePath.begin(),nodePath.end()); }
void setTrackNodePath(const osg::NodePath& nodePath)
{
_trackNodePath.clear();
_trackNodePath.reserve(nodePath.size());
std::copy(nodePath.begin(), nodePath.end(), std::back_inserter(_trackNodePath));
}
void setTrackNodePath(const ObserveredNodePath& nodePath) { _trackNodePath = nodePath; }
ObserveredNodePath& getTrackNodePath() { return _trackNodePath; }

2
src/osgPlugins/OpenFlight/ControlRecords.cpp
View File

@ -4,7 +4,7 @@
// Copyright (C) 2005-2006 Brede Johansen
//
#include <cassert>
#include <assert.h>
#include <osg/Geode>
#include <osg/Geometry>
#include "Registry.h"

2
src/osgPlugins/OpenFlight/GeometryRecords.cpp
View File

@ -4,7 +4,7 @@
// Copyright (C) 2005-2006 Brede Johansen
//
#include <cassert>
#include <assert.h>
#include <osg/Geode>
#include <osg/Billboard>
#include <osg/Geometry>

2
src/osgPlugins/OpenFlight/PaletteRecords.cpp
View File

@ -4,7 +4,7 @@
// Copyright (C) 2005-2006 Brede Johansen
//
#include <cassert>
#include <assert.h>
#include <osg/Texture2D>
#include <osg/TexEnv>
#include <osg/BlendFunc>

2
src/osgPlugins/OpenFlight/Pools.cpp
View File

@ -4,7 +4,7 @@
// Copyright (C) 2005-2006 Brede Johansen
//
#include <cassert>
#include <assert.h>
#include "Pools.h"
#include "Document.h"

4
src/osgPlugins/OpenFlight/Record.cpp
View File

@ -17,6 +17,10 @@ Record::Record()
{
}
Record::~Record()
{
}
void Record::setParent(PrimaryRecord* parent)
{
_parent = parent;

2
src/osgPlugins/OpenFlight/Record.h
View File

@ -49,7 +49,7 @@ public:
protected:
virtual ~Record() {}
virtual ~Record();
virtual void readRecord(RecordInputStream& in, Document& document);

4
src/osgPlugins/bsp/BSPLoad.cpp
View File

@ -5,10 +5,6 @@
#include "BSPLoad.h"
#include <fstream>
bool BSPLoad::Load(const std::string& filename, int curveTesselation)

1
src/osgPlugins/bsp/BSPLoad.h
View File

@ -10,6 +10,7 @@
#include <vector>
#include <string>
#include <fstream>
//Directory entry in header
class BSP_DIRECTORY_ENTRY

3
src/osgPlugins/lwo/ReaderWriterLWO.cpp
View File

@ -37,6 +37,7 @@
#include <osgUtil/Tesselator>
#include "Converter.h"
#include "VertexMap.h"
#include "old_lw.h"
#include "old_Lwo2.h"
@ -104,7 +105,7 @@ lwosg::Converter::Options ReaderWriterLWO::parse_options(const Options *options)
int unit;
if (iss >> mapname >> unit)
{
conv_options.texturemap_bindings.insert(std::make_pair(mapname, unit));
conv_options.texturemap_bindings.insert(lwosg::VertexMap_binding_map::value_type(mapname, unit));
}
}
if (opt == "MAX_TEXTURE_UNITS") {

6
src/osgPlugins/net/sockstream.cpp
View File

@ -64,7 +64,7 @@
#include <sstream>
#include <string>
#if (defined(__APPLE__)&&(__GNUC__<4)) || (defined(WIN32)&&!defined(__CYGWIN__)) || defined (__sgi) || defined (__hpux)
#if (defined(__APPLE__)&&(__GNUC__<4)) || (defined(WIN32)&&!defined(__CYGWIN__)) || defined (__sgi)
typedef int socklen_t;
#endif
@ -246,9 +246,7 @@ bool sockerr::benign () const
switch (err) {
case EINTR:
case EWOULDBLOCK:
// On FreeBSD (and probably on Linux too)
// EAGAIN has the same value as EWOULDBLOCK
#if !defined(__CYGWIN__) && !defined( __sgi) && !defined(__linux__) && !defined(__sun) && !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) // LN
#if defined(EAGAIN) && (EAGAIN != EWOULDBLOCK)
case EAGAIN:
#endif
return true;