Capitalized subdirectory names.

[flightgear.git] / Main / Makefile

diff --git a/Main/Makefile b/Main/Makefile
index cf435bc75e4810d5b107c5781023af05a1b56127..f639acb3b07d6ed75c7bd569ecaef8f1a7392cf1 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -24,7 +24,7 @@
 #---------------------------------------------------------------------------
 
 
-TARGET=viewer
+TARGET=fgfs0
 
 CC = gcc
 
@@ -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)
@@ -66,9 +66,10 @@ LIBS =  $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
 
 CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
 OFILES = $(CFILES:.c=.o)
-AFILES = ../aircraft/libaircraft.a ../flight/libflight.a \
-       ../flight/LaRCsim/libLaRCsim.a ../flight/slew/libslew.a \
-       ../mat3/libmat3.a ../scenery/libscenery.a
+AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
+       ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
+       ../Flight/Slew/libSlew.a ../mat3/libmat3.a ../Scenery/libScenery.a \
+       ../Timer/libTimer.a
 
 
 #---------------------------------------------------------------------------
@@ -88,21 +89,37 @@ clean:
 # Secondary Targets
 #---------------------------------------------------------------------------
 
-GLmain.o: GLmain.c GLUTkey.h ../aircraft/aircraft.h ../scenery/scenery.h
+GLmain.o: GLmain.c GLUTkey.h ../Aircraft/aircraft.h ../Scenery/scenery.h \
+       ../Timer/fg_timer.h
        $(CC) $(CFLAGS) $(INCLUDES) -c GLmain.c
 
-GLUTkey.o: GLUTkey.c GLUTkey.h ../aircraft/aircraft.h
+GLUTkey.o: GLUTkey.c GLUTkey.h ../Aircraft/aircraft.h
        $(CC) $(CFLAGS) $(INCLUDES) -c GLUTkey.c
 
-GLTKkey.o: GLTKkey.c GLTKkey.h ../aircraft/aircraft.h
+GLTKkey.o: GLTKkey.c GLTKkey.h ../Aircraft/aircraft.h
        $(CC) $(CFLAGS) $(INCLUDES) -c GLTKkey.c
 
-mesh2GL.o: mesh2GL.c ../scenery/mesh.h
+mesh2GL.o: mesh2GL.c ../Scenery/mesh.h
        $(CC) $(CFLAGS) $(INCLUDES) -c mesh2GL.c
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.13  1997/06/21 17:12:54  curt
+# Capitalized subdirectory names.
+#
+# Revision 1.12  1997/06/16 19:32:51  curt
+# Starting to add general timer support.
+#
+# Revision 1.11  1997/05/31 19:16:25  curt
+# Elevator trim added.
+#
+# Revision 1.10  1997/05/31 04:13:53  curt
+# WE CAN NOW FLY!!!
+#
+# Continuing work on the LaRCsim flight model integration.
+# Added some MSFS-like keyboard input handling.
+#
 # Revision 1.9  1997/05/30 23:26:19  curt
 # Added elevator/aileron controls.
 #