Minor changes to compile with rsxnt/win32.
This commit is contained in:
curt
parent
189c638b34
commit
80713ee205
10 changed files with 70 additions and 20 deletions
|
|
@ -51,7 +51,7 @@ $(TARGET): $(OFILES) $(HFILES)
|
|||
all: $(TARGET)
|
||||
|
||||
clean:
|
||||
rm -f *.o $(TARGET) *~ core
|
||||
rm -f *.o $(TARGET) lib*.a *~ core
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
|
@ -67,6 +67,9 @@ aircraft.h: ../Flight/flight.h ../Controls/controls.h
|
|||
|
||||
#---------------------------------------------------------------------------
|
||||
# $Log$
|
||||
# Revision 1.4 1997/06/25 15:39:44 curt
|
||||
# Minor changes to compile with rsxnt/win32.
|
||||
#
|
||||
# Revision 1.3 1997/06/21 17:12:42 curt
|
||||
# Capitalized subdirectory names.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -29,6 +29,10 @@
|
|||
|
||||
#include "aircraft.h"
|
||||
|
||||
#ifndef M_PI
|
||||
#define M_PI 3.14159265358979323846 /* pi */
|
||||
#endif
|
||||
|
||||
#define FG_RAD_2_DEG(RAD) ((RAD) * 180.0 / M_PI)
|
||||
|
||||
/* Display various parameters to stdout */
|
||||
|
|
@ -49,9 +53,12 @@ void aircraft_debug(int type) {
|
|||
|
||||
|
||||
/* $Log$
|
||||
/* Revision 1.7 1997/06/02 03:01:39 curt
|
||||
/* Working on views (side, front, back, transitions, etc.)
|
||||
/* Revision 1.8 1997/06/25 15:39:45 curt
|
||||
/* Minor changes to compile with rsxnt/win32.
|
||||
/*
|
||||
* Revision 1.7 1997/06/02 03:01:39 curt
|
||||
* Working on views (side, front, back, transitions, etc.)
|
||||
*
|
||||
* Revision 1.6 1997/05/31 19:16:26 curt
|
||||
* Elevator trim added.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ $(TARGET): $(OFILES)
|
|||
all: $(TARGET)
|
||||
|
||||
clean:
|
||||
rm -f *.o $(TARGET) *~ core
|
||||
rm -f *.o $(TARGET) lib*.a *~ core
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
|
@ -67,6 +67,9 @@ controls.o: controls.c controls.h ../Aircraft/aircraft.h
|
|||
|
||||
#---------------------------------------------------------------------------
|
||||
# $Log$
|
||||
# Revision 1.5 1997/06/25 15:39:46 curt
|
||||
# Minor changes to compile with rsxnt/win32.
|
||||
#
|
||||
# Revision 1.4 1997/06/21 17:12:47 curt
|
||||
# Capitalized subdirectory names.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ $(TARGET): $(OFILES)
|
|||
all: $(TARGET)
|
||||
|
||||
clean:
|
||||
rm -f *.o $(TARGET) *~ core
|
||||
rm -f *.o $(TARGET) lib*.a *~ core
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
|
@ -66,6 +66,9 @@ flight.o: flight.c flight.h
|
|||
|
||||
#---------------------------------------------------------------------------
|
||||
# $Log$
|
||||
# Revision 1.5 1997/06/25 15:39:46 curt
|
||||
# Minor changes to compile with rsxnt/win32.
|
||||
#
|
||||
# Revision 1.4 1997/06/21 17:12:48 curt
|
||||
# Capitalized subdirectory names.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -32,6 +32,10 @@
|
|||
#include "GLUTkey.h"
|
||||
#include "../Aircraft/aircraft.h"
|
||||
|
||||
#ifndef M_PI
|
||||
#define M_PI 3.14159265358979323846 /* pi */
|
||||
#endif
|
||||
|
||||
extern double fogDensity;
|
||||
extern double goal_view_offset;
|
||||
|
||||
|
|
@ -152,9 +156,12 @@ void GLUTspecialkey(int k, int x, int y) {
|
|||
|
||||
|
||||
/* $Log$
|
||||
/* Revision 1.12 1997/06/21 17:12:52 curt
|
||||
/* Capitalized subdirectory names.
|
||||
/* Revision 1.13 1997/06/25 15:39:46 curt
|
||||
/* Minor changes to compile with rsxnt/win32.
|
||||
/*
|
||||
* Revision 1.12 1997/06/21 17:12:52 curt
|
||||
* Capitalized subdirectory names.
|
||||
*
|
||||
* Revision 1.11 1997/06/18 04:10:31 curt
|
||||
* A couple more runway tweaks ...
|
||||
*
|
||||
|
|
|
|||
|
|
@ -47,10 +47,19 @@
|
|||
#define DEG_TO_RAD 0.017453292
|
||||
#define RAD_TO_DEG 57.29577951
|
||||
|
||||
#ifndef M_PI
|
||||
#define M_PI 3.14159265358979323846 /* pi */
|
||||
#endif
|
||||
|
||||
#ifndef PI2
|
||||
#define PI2 (M_PI + M_PI)
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef M_PI_2
|
||||
#define M_PI_2 1.57079632679489661923 /* pi/2 */
|
||||
#endif
|
||||
|
||||
/* This is a record containing all the info for the aircraft currently
|
||||
being operated */
|
||||
struct aircraft_params current_aircraft;
|
||||
|
|
@ -544,9 +553,12 @@ int main( int argc, char *argv[] ) {
|
|||
|
||||
|
||||
/* $Log$
|
||||
/* Revision 1.21 1997/06/22 21:44:41 curt
|
||||
/* Working on intergrating the VRML (subset) parser.
|
||||
/* Revision 1.22 1997/06/25 15:39:47 curt
|
||||
/* Minor changes to compile with rsxnt/win32.
|
||||
/*
|
||||
* Revision 1.21 1997/06/22 21:44:41 curt
|
||||
* Working on intergrating the VRML (subset) parser.
|
||||
*
|
||||
* Revision 1.20 1997/06/21 17:12:53 curt
|
||||
* Capitalized subdirectory names.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -53,12 +53,12 @@ INTERFACE_FILES = GLUTkey.c
|
|||
#---------------------------------------------------------------------------
|
||||
|
||||
# For OpenGL
|
||||
# GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11
|
||||
GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11
|
||||
|
||||
# For Mesa
|
||||
MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL
|
||||
X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11
|
||||
GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS)
|
||||
# MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL
|
||||
# X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11
|
||||
# GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS)
|
||||
|
||||
|
||||
CFLAGS = $(STD_CFLAGS) $(INTERFACE_FLAGS)
|
||||
|
|
@ -83,7 +83,7 @@ $(TARGET): $(OFILES) $(AFILES)
|
|||
all: $(TARGET)
|
||||
|
||||
clean:
|
||||
rm -f *.o $(TARGET) *~ core
|
||||
rm -f *.o $(TARGET) lib*.a *~ core
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
|
@ -106,6 +106,9 @@ mesh2GL.o: mesh2GL.c ../Scenery/mesh.h
|
|||
|
||||
#---------------------------------------------------------------------------
|
||||
# $Log$
|
||||
# Revision 1.15 1997/06/25 15:39:47 curt
|
||||
# Minor changes to compile with rsxnt/win32.
|
||||
#
|
||||
# Revision 1.14 1997/06/21 17:52:23 curt
|
||||
# Continue directory shuffling ... everything should be compilable/runnable
|
||||
# again.
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ $(TARGET): $(OFILES) $(HFILES)
|
|||
$(AR) rv $(TARGET) $(OFILES)
|
||||
|
||||
clean:
|
||||
rm -f *.o $(TARGET) *~ core
|
||||
rm -f *.o $(TARGET) lib*.a *~ core
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
|
@ -65,6 +65,9 @@ mesh.o: mesh.c mesh.h common.h
|
|||
|
||||
#---------------------------------------------------------------------------
|
||||
# $Log$
|
||||
# Revision 1.9 1997/06/25 15:39:48 curt
|
||||
# Minor changes to compile with rsxnt/win32.
|
||||
#
|
||||
# Revision 1.8 1997/06/21 17:58:07 curt
|
||||
# directory shuffling ...
|
||||
#
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ $(TARGET): $(OFILES)
|
|||
all: $(TARGET)
|
||||
|
||||
clean:
|
||||
rm -f *.o $(TARGET) *~ core
|
||||
rm -f *.o $(TARGET) lib*.a *~ core
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
|
@ -63,6 +63,9 @@ slew.o: slew.c slew.h ../../Aircraft/aircraft.h ../../Controls/controls.h
|
|||
|
||||
#---------------------------------------------------------------------------
|
||||
# $Log$
|
||||
# Revision 1.3 1997/06/25 15:39:46 curt
|
||||
# Minor changes to compile with rsxnt/win32.
|
||||
#
|
||||
# Revision 1.2 1997/06/21 17:12:51 curt
|
||||
# Capitalized subdirectory names.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -34,8 +34,10 @@
|
|||
|
||||
|
||||
unsigned long int fgSimTime;
|
||||
static struct itimerval t, ot;
|
||||
static void (*callbackfunc)(int multi_loop);
|
||||
|
||||
#ifdef HAVE_ITIMER
|
||||
static struct itimerval t, ot;
|
||||
static void (*callbackfunc)(int multi_loop);
|
||||
|
||||
|
||||
/* This routine catches the SIGALRM */
|
||||
|
|
@ -78,6 +80,7 @@ void fgTimerInit(float dt, void (*f)()) {
|
|||
}
|
||||
}
|
||||
|
||||
#endif HAVE_ITIMER
|
||||
|
||||
/* This function returns the number of milleseconds since the last
|
||||
time it was called. */
|
||||
|
|
@ -106,9 +109,12 @@ int fgGetTimeInterval() {
|
|||
|
||||
|
||||
/* $Log$
|
||||
/* Revision 1.3 1997/06/17 16:52:04 curt
|
||||
/* Timer interval stuff now uses gettimeofday() instead of ftime()
|
||||
/* Revision 1.4 1997/06/25 15:39:49 curt
|
||||
/* Minor changes to compile with rsxnt/win32.
|
||||
/*
|
||||
* Revision 1.3 1997/06/17 16:52:04 curt
|
||||
* Timer interval stuff now uses gettimeofday() instead of ftime()
|
||||
*
|
||||
* Revision 1.2 1997/06/17 03:41:10 curt
|
||||
* Nonsignal based interval timing is now working.
|
||||
* This would be a good time to look at cleaning up the code structure a bit.
|
||||
|
|
|
|||
Loading…
Reference in a new issue