Updated for plib-1.1.x

diff --git a/src/FDM/Balloon/BalloonSim.cpp b/src/FDM/Balloon/BalloonSim.cpp
index bb1454051a39de1286dbb5c1c4a0185b71abe4c0..44950f57f6f2e2795f49bcc3ce28a4d1eb0cdf06 100644 (file)
--- a/src/FDM/Balloon/BalloonSim.cpp
+++ b/src/FDM/Balloon/BalloonSim.cpp
@@ -49,7 +49,7 @@ HISTORY
 
 #include "BalloonSim.h"
 
-#include "sg.h"
+#include <plib/sg.h>
 
 /****************************************************************************/
 /********************************** CODE ************************************/

diff --git a/src/FDM/Balloon/BalloonSim.h b/src/FDM/Balloon/BalloonSim.h
index c0966f850c9b4d3385ea87019485b250c57ad202..b25161eb3dd1b85861a8c5954398c1617c82e9e4 100644 (file)
--- a/src/FDM/Balloon/BalloonSim.h
+++ b/src/FDM/Balloon/BalloonSim.h
@@ -43,7 +43,7 @@ HISTORY
 /****************************************************************************/
 /* INCLUDES                                                                */
 /****************************************************************************/
-#include <sg.h>
+#include <plib/sg.h>
                
 /****************************************************************************/
 /* DEFINES                                                                 */

diff --git a/src/GUI/gui.h b/src/GUI/gui.h
index ac820e27adee9269f1d040fe822f1d6341f6e1ea..318d185fc8a7f864992d2c7f6d6fbb7da86a0e64 100644 (file)
--- a/src/GUI/gui.h
+++ b/src/GUI/gui.h
@@ -25,7 +25,7 @@
 #ifndef _GUI_H_
 #define _GUI_H_
 
-#include <pu.h>                        // plib include
+#include <plib/pu.h>           // plib include
 
 extern void guiInit();
 extern void guiMotionFunc ( int x, int y );

diff --git a/src/Joystick/joystick.cxx b/src/Joystick/joystick.cxx
index 35cd5951e33520ba11022d4da16594eb4c07189b..e834571a8865a88898235a3d1be768d3fe3fa999 100644 (file)
--- a/src/Joystick/joystick.cxx
+++ b/src/Joystick/joystick.cxx
@@ -34,7 +34,7 @@
 #include <Main/options.hxx>
 
 #if defined( ENABLE_PLIB_JOYSTICK )
-#  include <js.h>              // plib include
+#  include <plib/js.h>         // plib include
 #elif defined( ENABLE_GLUT_JOYSTICK )
 #  include <GL/glut.h>
 #  include <XGL/xgl.h>

diff --git a/src/Joystick/js_demo.cxx b/src/Joystick/js_demo.cxx
index d2e88f0cbd5ce4488f7a0174aee875c217a4c20b..aeee4dbec750a83d7e5c180e2c3a457e2ed4ff56 100644 (file)
--- a/src/Joystick/js_demo.cxx
+++ b/src/Joystick/js_demo.cxx
@@ -1,5 +1,5 @@
 
-#include "js.h"
+#include <plib/js.h>
 
 int main ( int, char ** )
 {

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 007c4686733a9a2e69cc0f225208f8db8cf3307c..673113f346b4e6e2f668138cc0595d141f1cfdc4 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -66,7 +66,7 @@ fgfs_LDADD = \
        $(top_builddir)/Lib/Math/libMath.a \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Debug/libDebug.a \
-       -lpu -lfnt -lssg -lsg \
+       -lplibpu -lplibfnt -lplibssg -lplibsg \
        $(top_builddir)/Lib/Misc/libMisc.a \
        $(top_builddir)/Lib/zlib/libz.a \
        $(opengl_LIBS) \

diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx
index fccd4beb04ffce1b8d0737a0db23b94379afb549..a1d4f401b9a38e8ec9cb6e5a103f4b466a5112f7 100644 (file)
--- a/src/Main/keyboard.cxx
+++ b/src/Main/keyboard.cxx
@@ -39,7 +39,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <pu.h>                        // plib include
+#include <plib/pu.h>           // plib include
 
 #include <Debug/logstream.hxx>
 #include <Aircraft/aircraft.hxx>

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 5118ce04d40c461958f27943c5f5558aa5667684..66dc790dac5daae89ee0be36b853337356a8268e 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -55,12 +55,12 @@
 #  include <unistd.h>    /* for stat() */
 #endif
 
-#include <pu.h>                        // plib include
-#include <ssg.h>               // plib include
+#include <plib/pu.h>                   // plib include
+#include <plib/ssg.h>          // plib include
 
 #ifdef ENABLE_AUDIO_SUPPORT
-#  include <sl.h>              // plib include
-#  include <sm.h>              // plib include
+#  include <plib/sl.h>         // plib include
+#  include <plib/sm.h>         // plib include
 #endif
 
 #include <Include/fg_constants.h>  // for VERSION

diff --git a/src/Main/views.cxx b/src/Main/views.cxx
index 0bf2c6c15594fb46a639b6bb0b1728abab240d65..79bf08e9d36feba74f776def52c8c907bab0534a 100644 (file)
--- a/src/Main/views.cxx
+++ b/src/Main/views.cxx
@@ -26,7 +26,7 @@
 #  include <config.h>
 #endif
 
-#include <ssg.h>               // plib include
+#include <plib/ssg.h>          // plib include
 
 #include <Aircraft/aircraft.hxx>
 #include <Cockpit/panel.hxx>

diff --git a/src/Main/views.hxx b/src/Main/views.hxx
index 916cbcf8ce3f84088cee717c6405685fa70f90ab..15cf2e15fa0f0c21273c42d53d8f141f42f814c9 100644 (file)
--- a/src/Main/views.hxx
+++ b/src/Main/views.hxx
@@ -33,7 +33,7 @@
 
 #include <list>
 
-#include <sg.h>                        // plib include
+#include <plib/sg.h>           // plib include
 
 #include <FDM/flight.hxx>
 #include <Math/point3d.hxx>

diff --git a/src/Network/fg_socket.cxx b/src/Network/fg_socket.cxx
index c494ebf214d62e3a00c8179516741a6d7ccc688a..b0fb4b5becaecf51bcb17c2a3d3fb46925815b49 100644 (file)
--- a/src/Network/fg_socket.cxx
+++ b/src/Network/fg_socket.cxx
@@ -30,6 +30,10 @@
 #include <netdb.h>             // gethostbyname()
 #include <unistd.h>            // select(), fsync()/fdatasync()
 
+#if defined( sgi )
+#include <strings.h>
+#endif
+
 #include STL_STRING
 
 #include <Debug/logstream.hxx>
@@ -52,7 +56,7 @@ FGSocket::~FGSocket() {
 int FGSocket::make_server_socket () {
     struct sockaddr_in name;
 
-#if defined( __CYGWIN__ ) || defined( __CYGWIN32__ )
+#if defined( __CYGWIN__ ) || defined( __CYGWIN32__ ) || defined( sgi )
     int length;
 #else
     socklen_t length;

diff --git a/src/NetworkOLK/fgd.h b/src/NetworkOLK/fgd.h
index ceedb5a74240268bf77354ff063fd7bb8a867f98..ee9cc19d6bce0ea3e31432a0f4cb924878be4ef9 100644 (file)
--- a/src/NetworkOLK/fgd.h
+++ b/src/NetworkOLK/fgd.h
@@ -10,10 +10,8 @@
 /* this seems to be missing for glibc-2.0.x */
 /* libc5 & glibc-2.1 do have them           */
 #ifndef MSG_PEEK
-int     MSG_PEEK        = 0x02;    /* Peek at incoming messages.  */
-#define MSG_PEEK        MSG_PEEK
+#define MSG_PEEK        0x02    /* Peek at incoming messages.  */
 #endif
 #ifndef MSG_WAITALL
-int     MSG_WAITALL     = 0x100;   /* Wait for a full request.  */
-#define MSG_WAITALL     MSG_WAITALL
+#define MSG_WAITALL     0x100   /* Wait for a full request.  */
 #endif

diff --git a/src/NetworkOLK/net_send.cxx b/src/NetworkOLK/net_send.cxx
index ba7a78781912d7d046764b5fadfcb85bc390f48a..31329531eb6bf8dd8cc58a5ecba66f224e027201 100644 (file)
--- a/src/NetworkOLK/net_send.cxx
+++ b/src/NetworkOLK/net_send.cxx
@@ -37,7 +37,7 @@
 /* I prefer NHV's decl. */
 #include <Cockpit/hud.hxx>
 #include <Include/fg_constants.h>
-#include <ssg.h>
+#include <plib/ssg.h>
 #include <Main/views.hxx>
 
 //#define printf //

diff --git a/src/NetworkOLK/network.cxx b/src/NetworkOLK/network.cxx
index b5e985486110c305f583674a5e740f883e143760..07c9a9bc09a47092b8adb5b350aef8d3451deeef 100644 (file)
--- a/src/NetworkOLK/network.cxx
+++ b/src/NetworkOLK/network.cxx
@@ -62,8 +62,8 @@ extern "C" {
 */
 
 #include <Main/options.hxx>
-#include <sg.h>
-#include <ssg.h>
+#include <plib/sg.h>
+#include <plib/ssg.h>
 
 int  net_blast_toggle, net_hud_display, net_is_registered;
 char *net_callsign, *FGFS_host;

diff --git a/src/NetworkOLK/network.h b/src/NetworkOLK/network.h
index 69897f925f591433418fd8670b3efa0428b0da12..1f0d16587fda10e7de0a97cfc2628d451037790e 100644 (file)
--- a/src/NetworkOLK/network.h
+++ b/src/NetworkOLK/network.h
@@ -25,7 +25,7 @@
 
 #define FGD
 
-#include <ssg.h>
+#include <plib/ssg.h>
 
 extern char *net_callsign;
 extern int  net_hud_display;

diff --git a/src/Objects/materialmgr.hxx b/src/Objects/materialmgr.hxx
index 53d99e958e3aac1eef963a2ef7371e1c7ad0c964..f7af3ee494fef4f6bd5d8761f13b7b236f9ecc98 100644 (file)
--- a/src/Objects/materialmgr.hxx
+++ b/src/Objects/materialmgr.hxx
@@ -46,7 +46,7 @@
 #include <map>                 // STL associative "array"
 #include <vector>              // STL "array"
 
-#include <ssg.h>               // plib include
+#include <plib/ssg.h>          // plib include
 
 #include "material.hxx"
 

diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx
index b2df767c9d9b4208b13c9b7edb0b02305b44473a..d833a9a3a5f712f4a4117c3b13b417e92d0ea0a4 100644 (file)
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -44,7 +44,7 @@
 
 #include STL_STRING
 
-#include <ssg.h>               // plib include
+#include <plib/ssg.h>          // plib include
 
 #include <Scenery/tileentry.hxx>
 

diff --git a/src/Scenery/tilecache.cxx b/src/Scenery/tilecache.cxx
index d5e2f2317f4eea0a8ed5902b1bf0cc49932d6f8b..bed8713911da7fe598d88dcb4b447a48d2190dee 100644 (file)
--- a/src/Scenery/tilecache.cxx
+++ b/src/Scenery/tilecache.cxx
@@ -32,7 +32,7 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#include <ssg.h>               // plib include
+#include <plib/ssg.h>          // plib include
 
 #include <Debug/logstream.hxx>
 #include <Misc/fgstream.hxx>

diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx
index 49e7931fc1e97763d6209231ebf31c205be21a84..d84051b0984d82ef62ac9df7d9afbcf45b1455f3 100644 (file)
--- a/src/Scenery/tileentry.hxx
+++ b/src/Scenery/tileentry.hxx
@@ -45,13 +45,13 @@
 #include <vector>
 #include STL_STRING
 
-#include <ssg.h>               // plib includes
+#include <plib/ssg.h>          // plib includes
 
 #include <Bucket/newbucket.hxx>
 #include <Math/point3d.hxx>
 #include <Objects/fragment.hxx>
 
-#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+#if defined( sgi )
 #include <strings.h>
 #endif
 

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index d0f7088c6758196cb555420ef73268822431d09a..697ae5a16c5cf531a75d6854f61821e8f6f51c25 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -391,22 +391,6 @@ inline double fg_max3 (const double a, const double b, const double c ) {
     return a < b ? fg_max(b, c) : fg_max(a, c);
 }
 
-inline void sgdSetVec3 ( sgdVec3 dst, sgVec3 src )
-{
-  dst [ 0 ] = src [ 0 ] ;
-  dst [ 1 ] = src [ 1 ] ;
-  dst [ 2 ] = src [ 2 ] ;
-}
-
-inline void sgdSetMat4 ( sgdMat4 dst, sgMat4 src )
-{
-  for ( int i = 0; i < 4; ++i ) {
-      for ( int j = 0; j < 4; ++j ) {
-         dst [ i ] [ j ] = src [ i ] [ j ];
-      }
-  }
-}
-
 // check for an instersection with the individual triangles of a leaf
 static bool my_ssg_instersect_leaf( string s, ssgLeaf *leaf, sgdMat4 m,
                                    const sgdVec3 p, const sgdVec3 dir,

diff --git a/src/Time/light.hxx b/src/Time/light.hxx
index 35cda2efeee43cc6f588f34f397d1498925a0f79..f378ff183e961e63dc74bc9775ee37209664fda2 100644 (file)
--- a/src/Time/light.hxx
+++ b/src/Time/light.hxx
@@ -41,7 +41,7 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#include <sg.h>                        // plib include
+#include <plib/sg.h>                   // plib include
 
 #include <Math/interpolater.hxx>
 #include <Math/point3d.hxx>

diff --git a/src/WeatherCM/FGLocalWeatherDatabase.h b/src/WeatherCM/FGLocalWeatherDatabase.h
index 817ea34b7b6985469dbd3daaf6c9194969d84808..cf252da21e079e3115bbb1088e22d5914196cfeb 100644 (file)
--- a/src/WeatherCM/FGLocalWeatherDatabase.h
+++ b/src/WeatherCM/FGLocalWeatherDatabase.h
@@ -55,7 +55,7 @@ HISTORY
 /****************************************************************************/
 #include <vector>
 
-#include <sg.h>
+#include <plib/sg.h>
 
 #include <Math/sphrintp.h>
 

diff --git a/src/WeatherCM/FGPhysicalProperties.h b/src/WeatherCM/FGPhysicalProperties.h
index 6d88b6e819891b76cf9f271c877dccefb4840a87..35b2fa5f28f590e9ee7f796a07d7d8c34392ba47 100644 (file)
--- a/src/WeatherCM/FGPhysicalProperties.h
+++ b/src/WeatherCM/FGPhysicalProperties.h
@@ -67,7 +67,7 @@ HISTORY
 #include <vector>
 #include <map>
 
-#include <sg.h>
+#include <plib/sg.h>
 
 #include "FGWeatherDefs.h"
 

diff --git a/src/WeatherCM/FGPhysicalProperty.h b/src/WeatherCM/FGPhysicalProperty.h
index fe6bca4a2b8d25b5b31f97067cda4d68e33d1828..f6b2d39a913c2a0ebc066ad2a0bb73e452a5eb05 100644 (file)
--- a/src/WeatherCM/FGPhysicalProperty.h
+++ b/src/WeatherCM/FGPhysicalProperty.h
@@ -62,7 +62,7 @@ HISTORY
 
 #include <vector>
 
-#include <sg.h>
+#include <plib/sg.h>
 
 #include "FGWeatherDefs.h"
 #include "FGPhysicalProperties.h"

diff --git a/src/WeatherCM/FGThunderstorm.cpp b/src/WeatherCM/FGThunderstorm.cpp
index 2f160cfd952ac2b963b9d820f155add5bbcda9d3..5dbdddd537ec0f18485bb579098f3bb9ba316a82 100644 (file)
--- a/src/WeatherCM/FGThunderstorm.cpp
+++ b/src/WeatherCM/FGThunderstorm.cpp
@@ -44,7 +44,7 @@ HISTORY
 #include <stdlib.h>
 #include <time.h>
 
-#include <sg.h>
+#include <plib/sg.h>
 
 #include "FGThunderstorm.h"
 

diff --git a/src/WeatherCM/FGTurbulenceItem.h b/src/WeatherCM/FGTurbulenceItem.h
index ffec9550323a3365940a42281be72e99301841a6..0c6b2ae93f99c398c9a32a280bef4ebed6d85b47 100644 (file)
--- a/src/WeatherCM/FGTurbulenceItem.h
+++ b/src/WeatherCM/FGTurbulenceItem.h
@@ -60,7 +60,7 @@ HISTORY
 #  include <windows.h>
 #endif
 
-#include <sg.h>
+#include <plib/sg.h>
 
 #include "FGWeatherDefs.h"
 

diff --git a/src/WeatherCM/FGWeatherFeature.h b/src/WeatherCM/FGWeatherFeature.h
index 20031ae4b7723684315409c936751d9479b1976e..415a0527897e04dd8fc15cdc88bafcbd28d5f01b 100644 (file)
--- a/src/WeatherCM/FGWeatherFeature.h
+++ b/src/WeatherCM/FGWeatherFeature.h
@@ -51,7 +51,7 @@ HISTORY
 /****************************************************************************/
 #include <Include/compiler.h>
 
-#include <sg.h>
+#include <plib/sg.h>
 
 #include "FGWeatherDefs.h"
                

diff --git a/src/WeatherCM/FGWindItem.h b/src/WeatherCM/FGWindItem.h
index 0a745e02c2ca4385797ef515db5061f3e28efc18..80c6f9f98dc36beb6bbeb93d3979a5fc5c78d049 100644 (file)
--- a/src/WeatherCM/FGWindItem.h
+++ b/src/WeatherCM/FGWindItem.h
@@ -60,7 +60,7 @@ HISTORY
 #  include <windows.h>
 #endif
 
-#include <sg.h>
+#include <plib/sg.h>
 
 #include "FGWeatherDefs.h"