fly/flightgear
1
0
Fork 0
Code Activity

Updated for plib-1.1.x

Browse source
This commit is contained in:
curt 2000-02-04 22:50:04 +00:00
parent d70120752c
commit 095c069b39
28 changed files with 37 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/Balloon/BalloonSim.cpp
View file

@ -49,7 +49,7 @@ HISTORY
#include "BalloonSim.h"
#include "sg.h"
#include <plib/sg.h>
/****************************************************************************/
/********************************** CODE ************************************/

2
src/FDM/Balloon/BalloonSim.h
View file

@ -43,7 +43,7 @@ HISTORY
/****************************************************************************/
/* INCLUDES */
/****************************************************************************/
#include <sg.h>
#include <plib/sg.h>
/****************************************************************************/
/* DEFINES */

2
src/GUI/gui.h
View file

@ -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 );

2
src/Joystick/joystick.cxx
View file

@ -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>

2
src/Joystick/js_demo.cxx
View file

@ -1,5 +1,5 @@
#include "js.h"
#include <plib/js.h>
int main ( int, char ** )
{

2
src/Main/Makefile.am
View file

@ -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) \

2
src/Main/keyboard.cxx
View file

@ -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>

8
src/Main/main.cxx
View file

@ -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

2
src/Main/views.cxx
View file

@ -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>

2
src/Main/views.hxx
View file

@ -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>

6
src/Network/fg_socket.cxx
View file

@ -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;

6
src/NetworkOLK/fgd.h
View file

@ -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

2
src/NetworkOLK/net_send.cxx
View file

@ -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 //

4
src/NetworkOLK/network.cxx
View file

@ -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;

2
src/NetworkOLK/network.h
View file

@ -25,7 +25,7 @@
#define FGD
#include <ssg.h>
#include <plib/ssg.h>
extern char *net_callsign;
extern int net_hud_display;

2
src/Objects/materialmgr.hxx
View file

@ -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"

2
src/Objects/obj.hxx
View file

@ -44,7 +44,7 @@
#include STL_STRING
#include <ssg.h> // plib include
#include <plib/ssg.h> // plib include
#include <Scenery/tileentry.hxx>

2
src/Scenery/tilecache.cxx
View file

@ -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>

4
src/Scenery/tileentry.hxx
View file

@ -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

16
src/Scenery/tilemgr.cxx
View file

@ -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,

2
src/Time/light.hxx
View file

@ -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>

2
src/WeatherCM/FGLocalWeatherDatabase.h
View file

@ -55,7 +55,7 @@ HISTORY
/****************************************************************************/
#include <vector>
#include <sg.h>
#include <plib/sg.h>
#include <Math/sphrintp.h>

2
src/WeatherCM/FGPhysicalProperties.h
View file

@ -67,7 +67,7 @@ HISTORY
#include <vector>
#include <map>
#include <sg.h>
#include <plib/sg.h>
#include "FGWeatherDefs.h"

2
src/WeatherCM/FGPhysicalProperty.h
View file

@ -62,7 +62,7 @@ HISTORY
#include <vector>
#include <sg.h>
#include <plib/sg.h>
#include "FGWeatherDefs.h"
#include "FGPhysicalProperties.h"

2
src/WeatherCM/FGThunderstorm.cpp
View file

@ -44,7 +44,7 @@ HISTORY
#include <stdlib.h>
#include <time.h>
#include <sg.h>
#include <plib/sg.h>
#include "FGThunderstorm.h"

2
src/WeatherCM/FGTurbulenceItem.h
View file

@ -60,7 +60,7 @@ HISTORY
# include <windows.h>
#endif
#include <sg.h>
#include <plib/sg.h>
#include "FGWeatherDefs.h"

2
src/WeatherCM/FGWeatherFeature.h
View file

@ -51,7 +51,7 @@ HISTORY
/****************************************************************************/
#include <Include/compiler.h>
#include <sg.h>
#include <plib/sg.h>
#include "FGWeatherDefs.h"

2
src/WeatherCM/FGWindItem.h
View file

@ -60,7 +60,7 @@ HISTORY
# include <windows.h>
#endif
#include <sg.h>
#include <plib/sg.h>
#include "FGWeatherDefs.h"