Working on Makefile structure.

[flightgear.git] / Main / Makefile

diff --git a/Main/Makefile b/Main/Makefile
index 7abf6087dc4394d8fb4d5324d40d0adc54b9bb96..08f2d02723132019039bbe4ee308756c728af15c 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -24,51 +24,23 @@
 #---------------------------------------------------------------------------
 
 
-TARGET=viewer
+TARGET=fgfs0
 
-CC = gcc
-
-# STD_FLAGS = -O2 -Wall
-STD_CFLAGS = -g -Wall
-
-
-#---------------------------------------------------------------------------
-# Define the high level GL interface library
-#---------------------------------------------------------------------------
-
-# For GLUT
-INTERFACE_FLAGS = -DGLUT
-INTERFACE_LIBS = -lglut
-INTERFACE_FILES = GLUTkey.c
-
-# For MESA_TK (Tk interface to Mesa)
-# INCLUDES = -I/usr/include/mesa
-# INTERFACE_FLAGS = -DMESA_TK
-# INTERFACE_LIBS = -L/usr/lib/mesa -lMesatk
-# INTERFACE_FILES = GLTKkey.c
-
-
-#---------------------------------------------------------------------------
-# Define main GL libraries
-#---------------------------------------------------------------------------
+CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
+OFILES = $(CFILES:.c=.o)
+AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
+       ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
+       ../Flight/Slew/libSlew.a ../mat3/libmat3.a \
+       ../Scenery/ParseVRML/libParseVRML.a ../Scenery/libScenery.a \
+       ../Timer/libTimer.a
 
-# For OpenGL
-# GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11
 
-# For Mesa
-MESA_LIBS = -L/usr/lib/mesa -lMesaaux -lMesatk -lMesaGLU -lMesaGL
-X11_LIBS =  -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11
-GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS)
+include ../make.inc
 
 
-CFLAGS = $(STD_CFLAGS) $(INTERFACE_FLAGS)
+CFLAGS = $(FG_CFLAGS) $(INTERFACE_FLAGS)
 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
-
-
 
 #---------------------------------------------------------------------------
 # Primary Targets
@@ -80,28 +52,80 @@ $(TARGET): $(OFILES) $(AFILES)
 all: $(TARGET)
 
 clean:
-       rm -f *.o $(TARGET) *~ core
+       rm -f *.o $(TARGET) lib*.a *~ core
 
 
 #---------------------------------------------------------------------------
 # Secondary Targets
 #---------------------------------------------------------------------------
 
-GLmain.o: GLmain.c GLUTkey.h ../aircraft/aircraft.h ../scenery/scenery.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c GLmain.c
+include depend
 
-GLUTkey.o: GLUTkey.c GLUTkey.h ../aircraft/aircraft.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c GLUTkey.c
+GLmain.o:
+       $(CC) $(CFLAGS) -c GLmain.c
 
-GLTKkey.o: GLTKkey.c GLTKkey.h ../aircraft/aircraft.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c GLTKkey.c
+GLUTkey.o:
+       $(CC) $(CFLAGS) -c GLUTkey.c
 
-mesh2GL.o: mesh2GL.c ../scenery/mesh.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c mesh2GL.c
+GLTKkey.o:
+       $(CC) $(CFLAGS) -c GLTKkey.c
+
+mesh2GL.o:
+       $(CC) $(CFLAGS) -c mesh2GL.c
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.19  1997/06/27 21:38:09  curt
+# Working on Makefile structure.
+#
+# Revision 1.18  1997/06/27 20:03:36  curt
+# Working on Makefile structure.
+#
+# Revision 1.17  1997/06/26 22:14:54  curt
+# Beginning work on a scenery management system.
+#
+# Revision 1.16  1997/06/26 19:08:33  curt
+# Restructuring make, adding automatic "make dep" support.
+#
+# 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.
+#
+# 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.
+#
+# Revision 1.8  1997/05/30 19:27:02  curt
+# The LaRCsim flight model is starting to look like it is working.
+#
+# 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!