From: curt Date: Sat, 19 Jul 1997 22:41:34 +0000 (+0000) Subject: tweaks X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4438ee167969938aa4fe10b2a51cf886491f39bc;p=flightgear.git tweaks --- diff --git a/Aircraft/depend b/Aircraft/depend index fc10b018c..5de52b7c6 100644 --- a/Aircraft/depend +++ b/Aircraft/depend @@ -1,4 +1,4 @@ aircraft.o: aircraft.c aircraft.h ../Flight/flight.h \ ../Flight/Slew/slew.h ../Flight/LaRCsim/ls_interface.h \ ../Flight/LaRCsim/../flight.h ../Controls/controls.h \ - ../Controls/../limits.h + ../Controls/../limits.h ../constants.h diff --git a/Simulator/README b/Simulator/README index f8543dd97..f60aeeb71 100644 --- a/Simulator/README +++ b/Simulator/README @@ -1,8 +1,9 @@ +majordomo writes: Subdirectories ============== OpenGL/ ------- -"main" and OpenGL dependent mouse/keyboard/graphics code. +"main()" and OpenGL dependent mouse/keyboard/graphics code. Aircraft/ @@ -42,6 +43,16 @@ Timer/ Code to handle time and timing of events. +Utils/ +------ +Miscellaneous utility routines such as a general random number generator + + Weather/ -------- Weather management and modeling code. + + +Win32/ +------ +Win32 support stuff diff --git a/Simulator/make.inc b/Simulator/make.inc index e7e8e92d3..406cea719 100644 --- a/Simulator/make.inc +++ b/Simulator/make.inc @@ -98,28 +98,31 @@ GLOBAL_CFLAGS = -g -Wall #--------------------------------------------------------------------------- # Linux/Mesa with the GLUT toolkit # -# INTERFACE_FLAGS = -DGLUT -# INTERFACE_LIBS = -lglut -# INTERFACE_FILES = GLUTkey.c -# 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) -# FG_CFLAGS = $(GLOBAL_CFLAGS) +INTERFACE_FLAGS = -DGLUT +INTERFACE_LIBS = -lglut +INTERFACE_FILES = GLUTkey.c +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) +FG_CFLAGS = $(GLOBAL_CFLAGS) #--------------------------------------------------------------------------- #--------------------------------------------------------------------------- # Cygnus Win32 (gcc based) with a static version of the GLUT toolkit # -INTERFACE_FLAGS = -DGLUT -INTERFACE_LIBS = ../Win32/libglut.a -INTERFACE_FILES = GLUTkey.c -GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32 -FG_CFLAGS = $(GLOBAL_CFLAGS) -DWIN32 -DUSE_RAND +# INTERFACE_FLAGS = -DGLUT +# INTERFACE_LIBS = ../Win32/libglut.a +# INTERFACE_FILES = GLUTkey.c +# GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32 +# FG_CFLAGS = $(GLOBAL_CFLAGS) -DWIN32 -DUSE_RAND #--------------------------------------------------------------------------- #--------------------------------------------------------------------------- # $Log$ +# Revision 1.9 1997/07/19 22:41:35 curt +# tweaks +# # Revision 1.8 1997/07/18 23:41:20 curt # Tweaks for building with Cygnus Win32 compiler. #