1
0
Fork 0

Various Irix fixes. Thanks Erik!

This commit is contained in:
curt 2001-07-31 20:14:54 +00:00
parent e03579349b
commit 7a4bac978e
47 changed files with 172 additions and 57 deletions

View file

@ -16,6 +16,15 @@ AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LN_S
AR="ar"
OS=`uname -s`
if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
if test "$CXX" = "CC"; then
AR="CC -ar"
AC_SUBST(AR)
fi
fi
dnl Specify if we want logging (testing build) or not (release build)
# set logging default value
# with_logging=yes
@ -346,3 +355,10 @@ if test "x$with_efence" != "x"; then
else
echo "Electric fence: no"
fi
if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
if test "$CXX" = "CC"; then
echo "\nRemember to run: sh ../FlightGear-0.x.x/irix-hack.sh!\07\n"
fi
fi

View file

@ -40,7 +40,8 @@ genapts_LDADD = \
$(top_builddir)/src/Lib/Geometry/libGeometry.a \
$(top_builddir)/src/Lib/Output/libOutput.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgenpolyclip \
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgxml -lgenpolyclip \
-lz \
$(base_LIBS)
INCLUDES += \

View file

@ -27,9 +27,11 @@
#include <map>
#ifdef NEEDNAMESPACESTD
using namespace std;
#endif
#include <simgear/compiler.h>
#include <simgear/constants.h>
SG_USING_STD(less);
SG_USING_STD(map);
#include <simgear/constants.h>

View file

@ -13,6 +13,6 @@ testclipper_LDADD = \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/landcover/liblandcover.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgbucket -lsgdebug -lsgmisc -lz -lgenpolyclip
-lsgbucket -lsgdebug -lsgmisc -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles

View file

@ -27,6 +27,7 @@
# include <config.h>
#endif
#include <simgear/compiler.h>
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sgstream.hxx>
@ -36,7 +37,9 @@
#include "clipper.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
#endif
#define MASK_CLIP 1

View file

@ -28,6 +28,7 @@
# include <win32/mkdir.hpp>
#endif
#include <simgear/compiler.h>
#include <simgear/io/sg_binobj.hxx>
#include <simgear/misc/texcoord.hxx>
@ -39,8 +40,10 @@
#include "genobj.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
// calculate the global bounding sphere. Center is the center of the
@ -212,10 +215,11 @@ int FGGenOutput::build( FGConstruct& c ) {
//dcl - here read the flag to check if we are building UK grid
//If so - check if the bucket is within the UK lat & lon
if( (c.get_useUKGrid()) && (isInUK(ourPosition)) )
if( (c.get_useUKGrid()) && (isInUK(ourPosition)) ) {
tp_list = UK_calc_tex_coords( b, geod_nodes, fans[i][j], 1.0 );
else
} else {
tp_list = calc_tex_coords( b, geod_nodes, fans[i][j] );
}
int_list ti_list;
ti_list.clear();

View file

@ -18,11 +18,12 @@ fgfs_construct_LDADD = \
$(top_builddir)/src/Lib/landcover/liblandcover.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lplibsg -lz -lgenpolyclip
-lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lsgxml \
-lplibsg -lgenpolyclip -lz
fgfs_master_SOURCES = master.cxx
fgfs_master_LDADD = -lsgbucket -lsgmisc
fgfs_master_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml
INCLUDES += \
-I$(top_srcdir)/src \

View file

@ -36,8 +36,10 @@
# include <unistd.h> // set mem allocation limit
#endif
#include <iostream>
#include <string>
#include <simgear/compiler.h>
#include STL_IOSTREAM
#include STL_STRING
#include <vector>
#include <plib/sg.h>
@ -56,8 +58,10 @@
#include "construct.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
SG_USING_STD(string);
SG_USING_STD(vector);

View file

@ -25,6 +25,7 @@
# include <config.h>
#endif
#include <simgear/compiler.h>
#include <simgear/math/point3d.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/misc/sgstream.hxx>
@ -35,8 +36,10 @@
#include "match.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
FGMatch::FGMatch( void ) {

View file

@ -4,11 +4,11 @@ bin_PROGRAMS = fgfs-tools-server fgfs-tools-client
fgfs_tools_server_SOURCES = server.cxx
fgfs_tools_server_LDADD = -lsgbucket -lsgmisc
fgfs_tools_server_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml
fgfs_tools_client_SOURCES = client.cxx
fgfs_tools_client_LDADD = -lsgbucket -lsgmisc
fgfs_tools_client_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml
INCLUDES += \
-I$(top_srcdir)/src \

View file

@ -23,9 +23,12 @@
#include <stdio.h>
#include <stdlib.h> // atoi()
#include <string.h> // bcopy()
#include <strings.h> // bcopy() on Irix
#include <iostream>
#include <string>
#include <simgear/compiler.h>
#include STL_IOSTREAM
#include STL_STRING
#include <vector>
#include <simgear/bucket/newbucket.hxx>

View file

@ -15,8 +15,10 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <iostream>
#include <string>
#include <simgear/compiler.h>
#include STL_IOSTREAM
#include STL_STRING
#include <simgear/bucket/newbucket.hxx>

View file

@ -20,6 +20,7 @@
//
// $Id$
#include <simgear/compiler.h>
#include <Geometry/poly_support.hxx>
#include <Polygon/polygon.hxx>
@ -27,8 +28,10 @@
#include "triangle.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
// Constructor

View file

@ -8,6 +8,6 @@ testarray_SOURCES = testarray.cxx
testarray_LDADD = \
$(top_builddir)/src/Lib/Array/libArray.a \
-lsgbucket -lsgmath -lsgmisc -lz
-lsgbucket -lsgmath -lsgmisc -lsgdebug -lsgxml -lz
INCLUDES += -I$(top_srcdir)/src

View file

@ -58,8 +58,10 @@
#include "array.hxx"
SG_USING_STD(string);
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
FGArray::FGArray( void ) {

View file

@ -57,8 +57,10 @@
#include "dem.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
#define MAX_EX_NODES 10000

View file

@ -28,8 +28,10 @@
#include "trisegs.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
// Constructor

View file

@ -27,8 +27,10 @@
#include "genfans.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD( cout );
SG_USING_STD( endl );
#endif
// make sure the list is expanded at least to hold "n" and then push

View file

@ -30,7 +30,12 @@
#include <stdio.h>
#include <time.h>
#include <zlib.h>
#ifdef HAVE_ZLIB
# include <zlib.h>
#else
# include <simgear/zlib/zlib.h>
#endif
#include <list>
#include STL_STRING
@ -45,8 +50,10 @@
# include <Win32/mkdir.hpp>
#endif
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD( cout );
SG_USING_STD( endl );
#endif
void write_polygon( const FGPolygon& poly, const string& base ) {

View file

@ -29,8 +29,10 @@
#include "index.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
static long int poly_index;

View file

@ -30,8 +30,10 @@
SG_USING_STD(string);
SG_USING_STD(map);
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
typedef map<AreaType, string> area_type_map;

View file

@ -36,8 +36,10 @@ extern "C" {
#include "polygon.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
// Constructor

View file

@ -33,11 +33,13 @@
#include <simgear/compiler.h>
#include <simgear/math/sg_types.hxx>
#include <iostream>
#include <string>
#include STL_IOSTREAM
#include STL_STRING
#include <vector>
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ostream);
#endif
SG_USING_STD(string);
SG_USING_STD(vector);

View file

@ -28,8 +28,10 @@
#include "simple_clip.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
#define CLIP_EPSILON 0.000000000001

View file

@ -37,7 +37,9 @@
#include "simple_clip.hxx"
#include "split.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
#endif
static void clip_and_write_poly( string root, long int p_index, AreaType area,

View file

@ -5,7 +5,7 @@ libe00_a_SOURCES = e00.cxx e00.hxx
noinst_PROGRAMS = teste00
teste00_SOURCES = teste00.cxx
teste00_LDADD = libe00.a -lsgmisc -lz
teste00_LDADD = libe00.a -lsgmisc -lsgdebug -lsgxml -lz
INCLUDES += \
-I$(top_srcdir)/src \

View file

@ -1,21 +1,23 @@
// e00.cxx: implementation of ArcInfo (e00) reader.
#include <simgear/compiler.h>
#include "e00.hxx"
#include <vector>
#include <map>
#include <string>
#include <iostream>
#include STL_STRING
#include STL_IOSTREAM
#include <cctype>
#include <stdio.h>
using std::vector;
using std::map;
using std::string;
using std::istream;
using std::cerr;
using std::endl;
SG_USING_STD(vector);
SG_USING_STD(map);
SG_USING_STD(string);
SG_USING_STD(istream);
SG_USING_STD(cerr);
SG_USING_STD(endl);
////////////////////////////////////////////////////////////////////////

View file

@ -6,12 +6,14 @@
#include <simgear/compiler.h>
#include <vector>
#include <string>
#include <iostream>
#include STL_STRING
#include STL_IOSTREAM
using std::vector;
using std::string;
using std::istream;
SG_USING_STD(vector);
SG_USING_STD(string);
#if ! defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(istream);
#endif
// An exception reading an E00 file.

View file

@ -10,7 +10,9 @@
#include "landcover.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ifstream);
#endif
SG_USING_STD(string);
LandCover::LandCover( const string &filename )

View file

@ -10,9 +10,11 @@
#include <simgear/compiler.h>
#include STL_STRING
#include <fstream>
#include STL_FSTREAM
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ifstream);
#endif
SG_USING_STD(string);

View file

@ -3,16 +3,21 @@
// This program is in the Public Domain and comes with NO WARRANTY.
// Use at your own risk.
#include <simgear/compiler.h>
#include <stdlib.h>
#include <iostream>
#include <string>
#include STL_IOSTREAM
#include STL_STRING
#include "landcover.hxx"
using std::cerr;
using std::cout;
using std::endl;
using std::string;
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
#endif
SG_USING_STD(string);
int
main (int ac, const char * av[])

View file

@ -30,7 +30,7 @@ demchop_SOURCES = \
demchop_LDADD = \
$(top_builddir)/src/Lib/DEM/libDEM.a \
-lsgbucket -lsgmisc -lsgdebug -lz
-lsgbucket -lsgmisc -lsgdebug -lsgxml -lz
$(base_LIBS)
INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib

View file

@ -37,7 +37,9 @@
#include "point2d.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
#endif
SG_USING_STD(string);

View file

@ -30,7 +30,7 @@ deminfo_SOURCES = \
deminfo_LDADD = \
$(top_builddir)/src/Lib/DEM/libDEM.a \
-lsgbucket -lsgmisc -lz \
-lsgbucket -lsgmisc -lsgdebug -lsgxml -lz \
$(base_LIBS)
INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib

View file

@ -29,7 +29,9 @@
#include <DEM/dem.hxx>
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
#endif
// static float dem_data[DEM_SIZE_1][DEM_SIZE_1];

View file

@ -6,6 +6,6 @@ e00lines_LDADD = \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/e00/libe00.a \
-lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lz -lgenpolyclip
-lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src/Lib

View file

@ -33,12 +33,14 @@
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include <iostream>
#include <string>
#include STL_IOSTREAM
#include STL_STRING
#include <vector>
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cerr);
SG_USING_STD(cout);
#endif
SG_USING_STD(string);
SG_USING_STD(vector);

View file

@ -8,7 +8,7 @@ gshhs_SOURCES = \
gshhs_LDADD = \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz
debug_SOURCES = \
debug.cxx
@ -16,6 +16,6 @@ debug_SOURCES = \
debug_LDADD = \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib

View file

@ -23,12 +23,21 @@
// $Id$
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <simgear/compiler.h>
#include STL_STRING
#include <simgear/debug/logstream.hxx>
#include <zlib.h>
#ifdef HAVE_ZLIB
# include <zlib.h>
#else
# include <simgear/zlib/zlib.h>
#endif
#include <Polygon/index.hxx>
#include <Polygon/names.hxx>

View file

@ -36,7 +36,9 @@
#include "gshhs_split.hxx"
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
#endif
SG_USING_STD(string);

View file

@ -23,12 +23,21 @@
// $Id$
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <simgear/compiler.h>
#include STL_STRING
#include <simgear/debug/logstream.hxx>
#include <zlib.h>
#ifdef HAVE_ZLIB
# include <zlib.h>
#else
# include <simgear/zlib/zlib.h>
#endif
#include <Polygon/index.hxx>
#include <Polygon/names.hxx>
@ -43,7 +52,9 @@
#include "gshhs_split.hxx"
SG_USING_STD( string );
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD( cout );
#endif
// hackity, hackity, hack ... cough cough
#ifdef i386

View file

@ -10,6 +10,6 @@ testmerger_LDADD = \
$(top_builddir)/src/Prep/MergerClipper/libMergerClipper.a \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src/Lib

View file

@ -186,12 +186,13 @@ void FGMerger::merge( FGPolyList& clipped ) {
void FGMerger::clip(FGPolyList& subject, FGPolyList& clip) {
FGPolygon poly, result, cliped, difference;
int max_a[FG_MAX_AREA_TYPES];
int area;
int max_area = 0;
int default_indx=(int)get_area_type("Default");
difference = clip.polys[default_indx][0];
for ( int area = 0; area < FG_MAX_AREA_TYPES; ++area ) {
for ( area = 0; area < FG_MAX_AREA_TYPES; ++area ) {
//cout << " testing area = " << area << endl;
if ((int)subject.polys[area].size() > 0) {
cout << " Clipping polygon with area = " << area << endl;
@ -206,7 +207,7 @@ void FGMerger::clip(FGPolyList& subject, FGPolyList& clip) {
/* OK we have leftovers in difference where have we assign it. Simply add
it to the last area type */
int max=0;
for ( int area = 0; area < FG_MAX_AREA_TYPES; ++area ) {
for ( area = 0; area < FG_MAX_AREA_TYPES; ++area ) {
if ( max_a[area] > max) {
max_area=area;
}

View file

@ -36,7 +36,7 @@ photo_LDADD = \
$(top_builddir)/src/Lib/Geometry/libGeometry.a \
$(top_builddir)/src/Lib/Output/libOutput.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgenpolyclip \
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgxml -lgenpolyclip -lz
$(base_LIBS)
wgs84offset_SOURCES = wgs84offset.cxx

View file

@ -8,12 +8,12 @@ shape_decode_LDADD = \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/shapelib/libshape.a \
-lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz
noaa_decode_LDADD = \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/shapelib/libshape.a \
-lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src/Lib

View file

@ -39,7 +39,9 @@
# include <Win32/mkdir.hpp>
#endif
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD( cout );
#endif
SG_USING_STD( string );
// return the type of the shapefile record

View file

@ -39,7 +39,9 @@
# include <Win32/mkdir.hpp>
#endif
#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD( cout );
#endif
SG_USING_STD( string );
// return the type of the shapefile record