Working on incorporating the LaRCsim flight model.

[flightgear.git] / Main / Makefile

diff --git a/Main/Makefile b/Main/Makefile
index c0108b8ab1fc3ca330e28c81a760f049ab33c47a..dd4c51f1297f587451afb749cd4998539677f839 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -3,6 +3,22 @@
 #
 # Written by Curtis Olson, started May 1997.
 #
+# Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
 # $Id$
 # (Log is kept at end of this file)
 #---------------------------------------------------------------------------
@@ -10,19 +26,49 @@
 
 TARGET=viewer
 
-CFILES = gltkmain.c gltkkey.c mesh2ogl.c
-OFILES = $(CFILES:.c=.o)
-AFILES = ../flight/libflight.a ../aircraft/libaircraft.a ../scenery/libscenery.a
-
 CC = gcc
-CFLAGS = -g -Wall
-# CFLAGS = -O2 -Wall
 
-INCLUDES = -I/usr/include/mesa
+# 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
+#---------------------------------------------------------------------------
+
+# For OpenGL
+# 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 -lMesaaux -lMesatk -lMesaGLU -lMesaGL
-X11_LIBS =  -L/usr/X11R6/lib -lX11 -lXext
-LIBS =  $(MESA_LIBS) $(X11_LIBS) -lm -lfl
+
+CFLAGS = $(STD_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 ../flight/slew/libslew.a \
+       ../flight/LaRCsim/libLaRCsim.a ../aircraft/libaircraft.a \
+       ../scenery/libscenery.a
 
 
 
@@ -43,18 +89,41 @@ clean:
 # Secondary Targets
 #---------------------------------------------------------------------------
 
-gltkmain.o: gltkmain.c gltkkey.h ../aircraft/aircraft.h ../scenery/scenery.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c gltkmain.c
+GLmain.o: GLmain.c GLUTkey.h ../aircraft/aircraft.h ../scenery/scenery.h
+       $(CC) $(CFLAGS) $(INCLUDES) -c GLmain.c
 
-gltkkey.o: gltkkey.c gltkkey.h ../aircraft/aircraft.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c gltkkey.c
+GLUTkey.o: GLUTkey.c GLUTkey.h ../aircraft/aircraft.h
+       $(CC) $(CFLAGS) $(INCLUDES) -c GLUTkey.c
 
-mesh2ogl.o: mesh2ogl.c ../scenery/mesh.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c mesh2ogl.c
+GLTKkey.o: GLTKkey.c GLTKkey.h ../aircraft/aircraft.h
+       $(CC) $(CFLAGS) $(INCLUDES) -c GLTKkey.c
+
+mesh2GL.o: mesh2GL.c ../scenery/mesh.h
+       $(CC) $(CFLAGS) $(INCLUDES) -c mesh2GL.c
 
 
 #---------------------------------------------------------------------------
 # $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!
+#
+# Revision 1.3  1997/05/23 00:35:13  curt
+# Trying to get fog to work ...
+#
+# Revision 1.2  1997/05/21 15:57:52  curt
+# Renamed due to added GLUT support.
+#
 # Revision 1.1  1997/05/16 16:05:51  curt
 # Initial revision.
 #