Erik Hofman:

A big honkin' set of minor tweaks to bring TerraGear into Irix compliance.

autogen.sh

@@ -17,12 +17,6 @@ echo -n " automake: `automake --version | head -1 | awk '{print $4}'`"
 echo " ($AUTO_MAKE_VERSION)"
 echo ""
 
-ACLOCAL_OPTS=""
-if [ $AUTO_MAKE_VERSION -ge 14 ]; then
-    if [ $OSTYPE = "IRIX" -o $OSTYPE = "IRIX64" ]; then    echo " -I ."
-        ACLOCAL_OPTS="-I ."
-    fi
-fi
 echo "Running aclocal $ACLOCAL_OPTS"
 aclocal $ACLOCAL_OPTS
 
@@ -33,14 +27,8 @@ if [ ! -e src/Include/config.h.in ]; then
     exit 1
 fi    
 
-echo -n "Running automake"
+echo "Running automake --add-missing"
-if [ $OSTYPE = "IRIX" -o $OSTYPE = "IRIX64" ]; then
+automake --add-missing
-    echo " --add-missing --include-deps"
-    automake --add-missing --include-deps
-else
-    echo " --add-missing"
-    automake --add-missing
-fi
 
 echo "Running autoconf"
 autoconf
@@ -50,16 +38,6 @@ if [ ! -e configure ]; then
     exit 1
 fi
 
-# fixup Makefiles for Irix
-if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
-    echo "Fixing Makefiles for Irix"
-    for n in `find . -name Makefile.in`; do \
-        mv -f $n $n.ar-new; \
-        sed 's/$(AR) cru/$(AR) -o/g' $n.ar-new > $n; \
-        rm -f $n.ar-new; \
-    done;
-fi
-
 echo ""
 echo "======================================"
 

configure.ac

@@ -20,14 +20,35 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
-AR="ar"
+# specify the simgear location
-OS=`uname -s`
+AC_ARG_WITH(simgear, [  --with-simgear=PREFIX   Specify the prefix path to simgear])
-if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
+
+if test "x$with_simgear" != "x" ; then
+    echo "SimGear prefix path is $with_simgear"
+    EXTRA_DIRS="${EXTRA_DIRS} $with_simgear"
+fi
+
+dnl set the $host variable based on local machine/os
+AC_CANONICAL_HOST
+
+case "${host}" in
+*-*-irix*)
     if test "$CXX" = "CC"; then
         AR="CC -ar"
-        AC_SUBST(AR)
+        ARFLAGS="-o"
+        CXXFLAGS="$CXXFLAGS -I$with_simgear/include/simgear/compatibility"
+    else
+        AR="ar"
+        ARFLAGS="cru"
     fi
-fi
+    ;;
+*)
+    AR="ar"
+    ARFLAGS="cru"
+    ;;
+esac
+AC_SUBST(AR)
+AC_SUBST(ARFLAGS)
 
 dnl Specify if we want logging (testing build) or not (release build)
 # set logging default value
@@ -285,6 +306,24 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 
+dnl check for socklen_t (in Unix98)
+AC_MSG_CHECKING(for socklen_t)
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+int accept (int, struct sockaddr *, socklen_t *);
+],[],[
+AC_MSG_RESULT(yes)],[
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+int accept (int, struct sockaddr *, size_t *);
+],[],[
+AC_MSG_RESULT(size_t)
+AC_DEFINE([socklen_t], size_t, [Define for socklen_t])], [
+AC_MSG_RESULT(int)
+AC_DEFINE([socklen_t], int, [Define for socklen_t])])])
+
 dnl Checks for library functions.
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
@@ -350,9 +389,3 @@ else
     echo "Debug messages: yes"
 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
-

src/Airports/GenAirports/build.cxx

@@ -559,7 +559,8 @@ void build_airport( string airport_raw, float alt_m,
     // 3rd pass: generate all remaining runways not covered in the first pass
     for ( i = 0; i < (int)runways.size(); ++i ) {
 	string type_flag = runways[i].surface_flags.substr(2, 1);
-	if ( type_flag != "P" && type_flag != "R" && type_flag != "V" ) {
+	if ( type_flag != string("P") && type_flag != string("R")
+             && type_flag != string("V") ) {
 	    build_runway( runways[i], elev * SG_FEET_TO_METER,
 			  &rwy_polys, &texparams, &accum, &apt_base,
                           &apt_clearing );

src/Airports/GenAirports/lights.cxx

@@ -324,7 +324,7 @@ static superpoly_list gen_runway_threshold_lights( const FGRunway& rwy_info,
     ref2 = Point3D( lon, lat, 0.0 );
 
     // five lights for each side
-    for ( int i = 0; i < 5; ++i ) {
+    for ( i = 0; i < 5; ++i ) {
         g_lights.push_back( ref1 );
         g_normals.push_back( normal1 );
     

src/Airports/GenAirports/rwy_nonprec.cxx

@@ -142,7 +142,7 @@ void gen_non_precision_rwy( const FGRunway& rwy_info,
     SG_LOG(SG_GENERAL, SG_DEBUG, "Runway designation = " << rwy_info.rwy_no);
     SG_LOG(SG_GENERAL, SG_DEBUG, "Runway designation letter = " << letter);
 
-    if ( letter != "" ) {
+    if ( !letter.empty() ) {
 	start_pct = end_pct;
 	end_pct = start_pct + ( 90.0 / length );
 	gen_runway_section( rwy_info, runway_a,

src/Airports/GenAirports/rwy_prec.cxx

@@ -145,7 +145,7 @@ void gen_precision_rwy( const FGRunway& rwy_info,
     SG_LOG(SG_GENERAL, SG_DEBUG, "Runway designation = " << rwy_info.rwy_no);
     SG_LOG(SG_GENERAL, SG_DEBUG, "Runway designation letter = " << letter);
 
-    if ( letter != "" ) {
+    if ( !letter.empty() ) {
 	start_pct = end_pct;
 	end_pct = start_pct + ( 90.0 / length );
 	gen_runway_section( rwy_info, runway_a,

src/Airports/GenAirports/rwy_visual.cxx

@@ -131,7 +131,7 @@ void gen_visual_rwy( const FGRunway& rwy_info,
     SG_LOG(SG_GENERAL, SG_DEBUG, "Runway designation = " << rwy_info.rwy_no);
     SG_LOG(SG_GENERAL, SG_DEBUG, "Runway designation letter = " << letter);
 
-    if ( letter != "" ) {
+    if ( !letter.empty() ) {
 	start_pct = end_pct;
 	end_pct = start_pct + ( 90.0 / length );
 	gen_runway_section( rwy_info, runway_a,

src/BuildTiles/Clipper/clipper.cxx

@@ -37,9 +37,7 @@
 
 #include "clipper.hxx"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
-#endif
 
 
 #define MASK_CLIP 1

src/BuildTiles/GenOutput/genobj.cxx

@@ -40,10 +40,8 @@
 
 #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

src/BuildTiles/Main/main.cxx

@@ -62,10 +62,8 @@
 
 #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);
 

src/BuildTiles/Match/match.cxx

@@ -36,10 +36,8 @@
 
 #include "match.hxx"
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(endl);
-#endif
 
 
 FGMatch::FGMatch( void ) {

src/BuildTiles/Parallel/client.cxx

@@ -3,7 +3,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#  include <Include/config.h>
+#  include <config.h>
 #endif
 
 #ifdef HAVE_SYS_PARAM_H

src/BuildTiles/Parallel/server.cxx

@@ -1,6 +1,9 @@
 // remote_server.c -- Written by Curtis Olson
 //                 -- for CSci 5502
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,7 +29,7 @@ SG_USING_STD( cout );
 SG_USING_STD( cerr );
 SG_USING_STD( endl );
 
-#if defined (sun) || defined (__CYGWIN__)
+#if defined (sun) || defined (__CYGWIN__) || defined(sgi)
 #  define WAIT_ANY (pid_t)-1
 #endif
 

src/BuildTiles/Triangulate/triangle.cxx

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

src/Lib/Array/array.cxx

@@ -58,10 +58,8 @@
 #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 ) {

src/Lib/DEM/dem.cxx

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

src/Lib/Geometry/trisegs.cxx

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

src/Lib/Optimize/genfans.cxx

@@ -27,10 +27,8 @@
 
 #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

src/Lib/Output/output.cxx

@@ -45,10 +45,8 @@
 #  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 ) {

src/Lib/Polygon/polygon.cxx

@@ -34,9 +34,7 @@ extern "C" {
 #include <simgear/math/point3d.hxx>
 #include <simgear/misc/exception.hxx>
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(endl);
-#endif
 
 #include <poly2tri/interface.h>
 

src/Lib/Polygon/polygon.hxx

@@ -37,9 +37,7 @@
 #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);
 

src/Lib/e00/e00.cxx

@@ -28,7 +28,7 @@ SG_USING_STD(endl);
  * Append an integer to a string.
  */
 static void
-append (string &s, int i)
+strAppend (string &s, int i)
 {
   char buf[128];
   sprintf(buf, "%d", i);
@@ -40,7 +40,7 @@ append (string &s, int i)
  * Append a double-precision real to a string.
  */
 static void
-append (string &s, double f)
+strAppend (string &s, double f)
 {
   char buf[128];
   sprintf(buf, "%f", f);
@@ -150,7 +150,7 @@ expect (istream &input, int i)
   input >> in;
   if (in != i) {
     string message = "Expected ";
-    append(message, i);
+    strAppend(message, i);
     throw E00Exception(message.c_str());
   }
 }
@@ -166,7 +166,7 @@ expect (istream &input, double f)
   input >> in;
   if (in != f) {
     string message = "Expected ";
-    append(message, f);
+    strAppend(message, f);
     throw E00Exception(message.c_str());
   }
 }
@@ -180,7 +180,7 @@ expect (istream &input, const char *s)
 {
   string in;
   input >> in;
-  if (in != s) {
+  if (in != string(s)) {
     string message = "Expected ";
     message += s;
     throw E00Exception(message.c_str());
@@ -490,7 +490,7 @@ E00::readTX6 ()
   *_input >> dummy;
 				// FIXME: will fail if "JABBERWOCKY" appears
 				// in the text annotation itself
-  while (dummy != "JABBERWOCKY")
+  while (dummy != string("JABBERWOCKY"))
     *_input >> dummy;
 }
 
@@ -502,7 +502,7 @@ E00::readTX7 ()
   *_input >> dummy;
 				// FIXME: will fail if "JABBERWOCKY" appears
 				// in the text annotation itself
-  while (dummy != "JABBERWOCKY")
+  while (dummy != string("JABBERWOCKY"))
     *_input >> dummy;
 }
 
@@ -513,7 +513,7 @@ E00::readRXP ()
   *_input >> dummy;
 				// FIXME: will fail if "JABBERWOCKY" appears
 				// in the text annotation itself
-  while (dummy != "JABBERWOCKY")
+  while (dummy != string("JABBERWOCKY"))
     *_input >> dummy;
 }
 
@@ -524,7 +524,7 @@ E00::readRPL ()
   *_input >> dummy;
 				// FIXME: will fail if "JABBERWOCKY" appears
 				// in the text annotation itself
-  while (dummy != "JABBERWOCKY")
+  while (dummy != string("JABBERWOCKY"))
     *_input >> dummy;
 }
 
@@ -548,7 +548,7 @@ E00::readIFO ()
     *_input >> line;
 
   while (line != string("EOI")) {
-
+    int i;
 				// Start of a new IFO file.
     IFO ifo;
     IFO::Entry entry;
@@ -570,7 +570,7 @@ E00::readIFO ()
 
 				// Read the item definitions
     ifo.defs.resize(0);
-    for (int i = 0; i < ifo.numItems; i++) {
+    for (i = 0; i < ifo.numItems; i++) {
       IFO::ItemDef def;
 
       *_input >> def.itemName;
@@ -593,7 +593,7 @@ E00::readIFO ()
 
 				// Read the data records
     ifo.entries.resize(0);
-    for (int i = 0; i < ifo.numDataRecords; i++) {
+    for (i = 0; i < ifo.numDataRecords; i++) {
 //       cout << " Reading entry " << i << endl;
       entry.resize(0);
       line_pos = 0;

src/Lib/e00/e00.hxx

@@ -11,9 +11,7 @@
 
 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.

src/Lib/landcover/landcover.cxx

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

src/Lib/landcover/landcover.hxx

@@ -12,9 +12,7 @@
 #include STL_STRING
 #include STL_FSTREAM
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ifstream);
-#endif
 SG_USING_STD(string);
 
 

src/Lib/landcover/test-landcover.cxx

@@ -12,11 +12,9 @@
 
 #include "landcover.hxx"
 
-#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

src/Lib/vpf/coverage.cxx

@@ -84,8 +84,16 @@ VpfCoverage::hasFeature (const string &name) const
 {
   if (_feature_names == 0)
     getFeatureNames();
-  return (find(_feature_names->begin(), _feature_names->end(), name)
+
-	  != _feature_names->end());
+  vector<const string>::iterator it;
+  for (it = _feature_names->begin(); it != _feature_names->end(); it++)
+    if (*it == name)
+       return(it != _feature_names->end());
+
+  return false;
+
+  // return (std::find(_feature_names->begin(), _feature_names->end(), name)
+  //	  != _feature_names->end());
 }
 
 const VpfFeature

src/Lib/vpf/feature.cxx

@@ -247,12 +247,12 @@ VpfFeature::getFCA () const
 bool
 VpfFeature::isProperty (const string &name) const
 {
-  return (name != "id" &&
+  return (name != string("id") &&
-	  name != "tile_id" &&
+	  name != string("tile_id") &&
-	  name != "end_id" &&
+	  name != string("end_id") &&
-	  name != "edg_id" &&
+	  name != string("edg_id") &&
-	  name != "fac_id" &&
+	  name != string("fac_id") &&
-	  name != "txt_id");
+	  name != string("txt_id"));
 }
 
 const string

src/Lib/vpf/property.cxx

@@ -112,7 +112,7 @@ VpfPropertyDecl::getVDTName () const
 bool
 VpfPropertyDecl::hasVDT () const
 {
-  return (getVDTName() != "-");
+  return (getVDTName() != string("-"));
 }
 
 const VpfTable &

src/Lib/vpf/table.cxx

@@ -4,6 +4,8 @@
 #include <string>
 #include <fstream>
 
+#include <simgear/misc/zfstream.hxx>	// ios_binary
+
 using std::string;
 using std::ifstream;
 using std::istream;
@@ -290,11 +292,11 @@ VpfTable::read (const string &fileName)
   _path = fileName;
   ifstream input;
 
-  input.open(fileName.c_str(), std::ios::binary);
+  input.open(fileName.c_str(), ios_binary);
   if (!input) {
     input.clear();
     string fileName2 = fileName + '.';
-    input.open(fileName2.c_str(), std::ios::binary);
+    input.open(fileName2.c_str(), ios_binary);
   }
   if (!input)
     throw VpfException(string("Failed to open VPF table file ") + fileName);
@@ -363,7 +365,11 @@ VpfTable::read_row (istream &input, VpfValue * row)
   if (!input.get(c))
     return false;
   else
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
     input.unget();
+#else
+    input.putback(c);
+#endif
 				// OK, continue
   int nCols = _columns.size();
   for (int i = 0; i < nCols; i++) {

src/Prep/DemChop/demchop.cxx

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

src/Prep/DemInfo/deminfo.cxx

@@ -29,9 +29,7 @@
 
 #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];

src/Prep/E00Lines/Makefile.am

@@ -6,6 +6,7 @@ e00lines_LDADD = \
 	$(top_builddir)/src/Lib/Geometry/libGeometry.a \
 	$(top_builddir)/src/Lib/Polygon/libPolygon.a \
 	$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
+	$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
 	$(top_builddir)/src/Lib/e00/libe00.a \
 	-lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz
 

src/Prep/E00Lines/main.cxx

@@ -37,10 +37,8 @@
 #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);
 

src/Prep/GSHHS/gshhs_split.cxx

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

src/Prep/GSHHS/main.cxx

@@ -48,9 +48,7 @@
 #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

src/Prep/ShapeFile/noaa-decode.cxx

@@ -39,9 +39,7 @@
 #  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

src/Prep/ShapeFile/shape-decode.cxx

@@ -39,9 +39,7 @@
 #  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
@@ -214,7 +212,7 @@ int main( int argc, char **argv ) {
 
     string shapetype = SHPTypeName( nShapeType );
 
-    if ( shapetype != "Polygon" ) {
+    if ( shapetype != string("Polygon") ) {
 	SG_LOG( SG_GENERAL, SG_ALERT, "Can't handle non-polygon shape files" );
 	exit(-1);
     }

src/Prep/TGVPF/Makefile.am

@@ -6,6 +6,7 @@ tgvpf_LDADD = \
 	$(top_builddir)/src/Lib/Geometry/libGeometry.a \
 	$(top_builddir)/src/Lib/Polygon/libPolygon.a \
 	$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
+	$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
 	$(top_builddir)/src/Lib/vpf/libvpf.a \
 	-lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz
 

src/Prep/TGVPF/tgvpf.cxx

@@ -37,10 +37,8 @@
 #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);
 
@@ -485,7 +483,7 @@ main (int argc, const char **argv)
 	const tg::Line line = vpf2tg(feature.getLine(i));
 	if (!bounds.isOverlapping(line.getBounds()))
 	  continue;
-	makePolygon(line, (width == -1 ? 50 : width), shape);
+	tg::makePolygon(line, (width == -1 ? 50 : width), shape);
 	break;
       }
       case VpfFeature::POLYGON: {

src/Prep/UserDef/Makefile.am

@@ -6,6 +6,7 @@ tguserdef_LDADD = \
 	$(top_builddir)/src/Lib/Geometry/libGeometry.a \
 	$(top_builddir)/src/Lib/Polygon/libPolygon.a \
 	$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
+	$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
 	-lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lsgdebug -lgenpolyclip -lz
 
 INCLUDES = -I$(top_srcdir)/src/Lib

src/Prep/UserDef/tguserdef.cxx

@@ -84,7 +84,7 @@ add_line (SGPropertyNode_ptr node)
   }
 
   FGPolygon poly;
-  makePolygon(line, node->getIntValue("width", 10), poly);
+  tg::makePolygon(line, node->getIntValue("width", 10), poly);
   poly = polygon_int(poly, bounds_poly);
   split_polygon(".", material, poly);
 }