From: curt Date: Fri, 4 Feb 2000 22:50:04 +0000 (+0000) Subject: Updated for plib-1.1.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=095c069b3966c251b8554d8c2b76d74ff30f9621;p=flightgear.git Updated for plib-1.1.x --- diff --git a/src/FDM/Balloon/BalloonSim.cpp b/src/FDM/Balloon/BalloonSim.cpp index bb1454051..44950f57f 100644 --- a/src/FDM/Balloon/BalloonSim.cpp +++ b/src/FDM/Balloon/BalloonSim.cpp @@ -49,7 +49,7 @@ HISTORY #include "BalloonSim.h" -#include "sg.h" +#include /****************************************************************************/ /********************************** CODE ************************************/ diff --git a/src/FDM/Balloon/BalloonSim.h b/src/FDM/Balloon/BalloonSim.h index c0966f850..b25161eb3 100644 --- a/src/FDM/Balloon/BalloonSim.h +++ b/src/FDM/Balloon/BalloonSim.h @@ -43,7 +43,7 @@ HISTORY /****************************************************************************/ /* INCLUDES */ /****************************************************************************/ -#include +#include /****************************************************************************/ /* DEFINES */ diff --git a/src/GUI/gui.h b/src/GUI/gui.h index ac820e27a..318d185fc 100644 --- a/src/GUI/gui.h +++ b/src/GUI/gui.h @@ -25,7 +25,7 @@ #ifndef _GUI_H_ #define _GUI_H_ -#include // plib include +#include // 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 35cd5951e..e834571a8 100644 --- a/src/Joystick/joystick.cxx +++ b/src/Joystick/joystick.cxx @@ -34,7 +34,7 @@ #include
#if defined( ENABLE_PLIB_JOYSTICK ) -# include // plib include +# include // plib include #elif defined( ENABLE_GLUT_JOYSTICK ) # include # include diff --git a/src/Joystick/js_demo.cxx b/src/Joystick/js_demo.cxx index d2e88f0cb..aeee4dbec 100644 --- a/src/Joystick/js_demo.cxx +++ b/src/Joystick/js_demo.cxx @@ -1,5 +1,5 @@ -#include "js.h" +#include int main ( int, char ** ) { diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am index 007c46867..673113f34 100644 --- 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 fccd4beb0..a1d4f401b 100644 --- a/src/Main/keyboard.cxx +++ b/src/Main/keyboard.cxx @@ -39,7 +39,7 @@ #include #include -#include // plib include +#include // plib include #include #include diff --git a/src/Main/main.cxx b/src/Main/main.cxx index 5118ce04d..66dc790da 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -55,12 +55,12 @@ # include /* for stat() */ #endif -#include // plib include -#include // plib include +#include // plib include +#include // plib include #ifdef ENABLE_AUDIO_SUPPORT -# include // plib include -# include // plib include +# include // plib include +# include // plib include #endif #include // for VERSION diff --git a/src/Main/views.cxx b/src/Main/views.cxx index 0bf2c6c15..79bf08e9d 100644 --- a/src/Main/views.cxx +++ b/src/Main/views.cxx @@ -26,7 +26,7 @@ # include #endif -#include // plib include +#include // plib include #include #include diff --git a/src/Main/views.hxx b/src/Main/views.hxx index 916cbcf8c..15cf2e15f 100644 --- a/src/Main/views.hxx +++ b/src/Main/views.hxx @@ -33,7 +33,7 @@ #include -#include // plib include +#include // plib include #include #include diff --git a/src/Network/fg_socket.cxx b/src/Network/fg_socket.cxx index c494ebf21..b0fb4b5be 100644 --- a/src/Network/fg_socket.cxx +++ b/src/Network/fg_socket.cxx @@ -30,6 +30,10 @@ #include // gethostbyname() #include // select(), fsync()/fdatasync() +#if defined( sgi ) +#include +#endif + #include STL_STRING #include @@ -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 ceedb5a74..ee9cc19d6 100644 --- 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 ba7a78781..31329531e 100644 --- a/src/NetworkOLK/net_send.cxx +++ b/src/NetworkOLK/net_send.cxx @@ -37,7 +37,7 @@ /* I prefer NHV's decl. */ #include #include -#include +#include #include
//#define printf // diff --git a/src/NetworkOLK/network.cxx b/src/NetworkOLK/network.cxx index b5e985486..07c9a9bc0 100644 --- a/src/NetworkOLK/network.cxx +++ b/src/NetworkOLK/network.cxx @@ -62,8 +62,8 @@ extern "C" { */ #include
-#include -#include +#include +#include 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 69897f925..1f0d16587 100644 --- a/src/NetworkOLK/network.h +++ b/src/NetworkOLK/network.h @@ -25,7 +25,7 @@ #define FGD -#include +#include extern char *net_callsign; extern int net_hud_display; diff --git a/src/Objects/materialmgr.hxx b/src/Objects/materialmgr.hxx index 53d99e958..f7af3ee49 100644 --- a/src/Objects/materialmgr.hxx +++ b/src/Objects/materialmgr.hxx @@ -46,7 +46,7 @@ #include // STL associative "array" #include // STL "array" -#include // plib include +#include // plib include #include "material.hxx" diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx index b2df767c9..d833a9a3a 100644 --- a/src/Objects/obj.hxx +++ b/src/Objects/obj.hxx @@ -44,7 +44,7 @@ #include STL_STRING -#include // plib include +#include // plib include #include diff --git a/src/Scenery/tilecache.cxx b/src/Scenery/tilecache.cxx index d5e2f2317..bed871391 100644 --- a/src/Scenery/tilecache.cxx +++ b/src/Scenery/tilecache.cxx @@ -32,7 +32,7 @@ #include #include -#include // plib include +#include // plib include #include #include diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx index 49e7931fc..d84051b09 100644 --- a/src/Scenery/tileentry.hxx +++ b/src/Scenery/tileentry.hxx @@ -45,13 +45,13 @@ #include #include STL_STRING -#include // plib includes +#include // plib includes #include #include #include -#ifdef FG_HAVE_NATIVE_SGI_COMPILERS +#if defined( sgi ) #include #endif diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx index d0f7088c6..697ae5a16 100644 --- 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 35cda2efe..f378ff183 100644 --- a/src/Time/light.hxx +++ b/src/Time/light.hxx @@ -41,7 +41,7 @@ #include #include -#include // plib include +#include // plib include #include #include diff --git a/src/WeatherCM/FGLocalWeatherDatabase.h b/src/WeatherCM/FGLocalWeatherDatabase.h index 817ea34b7..cf252da21 100644 --- a/src/WeatherCM/FGLocalWeatherDatabase.h +++ b/src/WeatherCM/FGLocalWeatherDatabase.h @@ -55,7 +55,7 @@ HISTORY /****************************************************************************/ #include -#include +#include #include diff --git a/src/WeatherCM/FGPhysicalProperties.h b/src/WeatherCM/FGPhysicalProperties.h index 6d88b6e81..35b2fa5f2 100644 --- a/src/WeatherCM/FGPhysicalProperties.h +++ b/src/WeatherCM/FGPhysicalProperties.h @@ -67,7 +67,7 @@ HISTORY #include #include -#include +#include #include "FGWeatherDefs.h" diff --git a/src/WeatherCM/FGPhysicalProperty.h b/src/WeatherCM/FGPhysicalProperty.h index fe6bca4a2..f6b2d39a9 100644 --- a/src/WeatherCM/FGPhysicalProperty.h +++ b/src/WeatherCM/FGPhysicalProperty.h @@ -62,7 +62,7 @@ HISTORY #include -#include +#include #include "FGWeatherDefs.h" #include "FGPhysicalProperties.h" diff --git a/src/WeatherCM/FGThunderstorm.cpp b/src/WeatherCM/FGThunderstorm.cpp index 2f160cfd9..5dbdddd53 100644 --- a/src/WeatherCM/FGThunderstorm.cpp +++ b/src/WeatherCM/FGThunderstorm.cpp @@ -44,7 +44,7 @@ HISTORY #include #include -#include +#include #include "FGThunderstorm.h" diff --git a/src/WeatherCM/FGTurbulenceItem.h b/src/WeatherCM/FGTurbulenceItem.h index ffec95503..0c6b2ae93 100644 --- a/src/WeatherCM/FGTurbulenceItem.h +++ b/src/WeatherCM/FGTurbulenceItem.h @@ -60,7 +60,7 @@ HISTORY # include #endif -#include +#include #include "FGWeatherDefs.h" diff --git a/src/WeatherCM/FGWeatherFeature.h b/src/WeatherCM/FGWeatherFeature.h index 20031ae4b..415a05278 100644 --- a/src/WeatherCM/FGWeatherFeature.h +++ b/src/WeatherCM/FGWeatherFeature.h @@ -51,7 +51,7 @@ HISTORY /****************************************************************************/ #include -#include +#include #include "FGWeatherDefs.h" diff --git a/src/WeatherCM/FGWindItem.h b/src/WeatherCM/FGWindItem.h index 0a745e02c..80c6f9f98 100644 --- a/src/WeatherCM/FGWindItem.h +++ b/src/WeatherCM/FGWindItem.h @@ -60,7 +60,7 @@ HISTORY # include #endif -#include +#include #include "FGWeatherDefs.h"