Working on incorporating the LaRCsim flight model.

[flightgear.git] / Main / Makefile

diff --git a/Main/Makefile b/Main/Makefile
index 7abf6087dc4394d8fb4d5324d40d0adc54b9bb96..dd4c51f1297f587451afb749cd4998539677f839 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -56,7 +56,7 @@ INTERFACE_FILES = GLUTkey.c
 # GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11
 
 # For Mesa
-MESA_LIBS = -L/usr/lib/mesa -lMesaaux -lMesatk -lMesaGLU -lMesaGL
+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)
 
@@ -66,7 +66,9 @@ LIBS =  $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
 
 CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
 OFILES = $(CFILES:.c=.o)
-AFILES = ../flight/libflight.a ../aircraft/libaircraft.a ../scenery/libscenery.a
+AFILES = ../flight/libflight.a ../flight/slew/libslew.a \
+       ../flight/LaRCsim/libLaRCsim.a ../aircraft/libaircraft.a \
+       ../scenery/libscenery.a
 
 
 
@@ -102,6 +104,16 @@ mesh2GL.o: mesh2GL.c ../scenery/mesh.h
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.7  1997/05/29 22:39:50  curt
+# Working on incorporating the LaRCsim flight model.
+#
+# Revision 1.6  1997/05/29 02:33:23  curt
+# Updated to reflect changing interfaces in other "modules."
+#
+# Revision 1.5  1997/05/27 17:44:32  curt
+# Renamed & rearranged variables and routines.   Added some initial simple
+# timer/alarm routines so the flight model can be updated on a regular interval.
+#
 # Revision 1.4  1997/05/23 15:40:26  curt
 # Added GNU copyright headers.
 # Fog now works!