Add xgl wrappers for debugging.

[flightgear.git] / Main / Makefile

diff --git a/Main/Makefile b/Main/Makefile
index a0bb6e9076efe2052a0e271e070f2a1e56ab21a6..d1a06e1589c8da852d5d1a125e395fa37fe53dc0 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -24,22 +24,23 @@
 #---------------------------------------------------------------------------
 
 
-TARGET=fg0
-
-CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
+CFILES = fg_init.c views.c $(INTERFACE_FILES)
 OFILES = $(CFILES:.c=.o)
-AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
-       ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
-       ../Flight/Slew/libSlew.a ../Math/libMath.a \
-       ../Scenery/libScenery.a \
-       ../Timer/libTimer.a ../Utils/libUtils.a ../Weather/libWeather.a
+AFILES = ../Aircraft/libAircraft.a ../Cockpit/libCockpit.a \
+       ../Controls/libControls.a ../Flight/libFlight.a \
+       ../Joystick/libJoystick.a ../Flight/LaRCsim/libLaRCsim.a \
+       ../Flight/Slew/libSlew.a ../Scenery/libScenery.a \
+       ../Time/libTime.a ../Weather/libWeather.a ../Math/libMath.a \
 
 
 include ../make.inc
 
 
 CFLAGS = $(FG_CFLAGS) $(INTERFACE_FLAGS)
-LIBS =  $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
+LIBS =  $(FG_DEBUG_LIBS) $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
+
+
+TARGET=fg-$(FG_VERSION)
 
 
 #---------------------------------------------------------------------------
@@ -48,11 +49,14 @@ LIBS =  $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
 
 $(TARGET): $(OFILES) $(AFILES)
        $(CC) -o $(TARGET) $(OFILES) $(AFILES) $(LIBS)
+       $(LN) $(TARGET) fg$(FG_VERSION_MAJOR)
 
 all: $(TARGET)
 
 clean:
-       rm -f *.o $(TARGET) $(TARGET).exe lib*.a *.os2 *~ core
+       rm -f *.o $(TARGET) $(TARGET).exe \
+               fg$(FG_VERSION_MAJOR) fg$(FG_VERSION_MAJOR).exe \
+               lib*.a *.os2 *~ core
 
 
 #---------------------------------------------------------------------------
@@ -61,8 +65,8 @@ clean:
 
 include depend
 
-GLmain.o:
-       $(CC) $(CFLAGS) -c GLmain.c -o $@
+GLUTmain.o:
+       $(CC) $(CFLAGS) -c GLUTmain.c -o $@
 
 GLUTkey.o:
        $(CC) $(CFLAGS) -c GLUTkey.c -o $@
@@ -70,12 +74,55 @@ GLUTkey.o:
 GLTKkey.o:
        $(CC) $(CFLAGS) -c GLTKkey.c -o $@
 
-mesh2GL.o:
-       $(CC) $(CFLAGS) -c mesh2GL.c -o $@
+fg_init.o:
+       $(CC) $(CFLAGS) -c fg_init.c -o $@
+
+views.o:
+       $(CC) $(CFLAGS) -c views.c -o $@
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.38  1997/12/15 23:54:47  curt
+# Add xgl wrappers for debugging.
+# Generate terrain normals on the fly.
+#
+# Revision 1.37  1997/12/12 21:41:26  curt
+# More light/material property tweaking ... still a ways off.
+#
+# Revision 1.36  1997/12/10 01:19:47  curt
+# Tweaks for verion 0.15 release.
+#
+# Revision 1.35  1997/10/28 21:11:22  curt
+# Organizational changes.
+#
+# Revision 1.34  1997/10/25 03:24:21  curt
+# Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
+#
+# Revision 1.33  1997/09/04 02:17:35  curt
+# Shufflin' stuff.
+#
+# Revision 1.32  1997/08/27 21:31:27  curt
+# Added views.[ch]
+#
+# Revision 1.31  1997/08/25 20:27:23  curt
+# Merged in initial HUD and Joystick code.
+#
+# Revision 1.30  1997/08/22 21:34:40  curt
+# Doing a bit of reorganizing and house cleaning.
+#
+# Revision 1.29  1997/08/04 20:25:15  curt
+# Organizational tweaking.
+#
+# Revision 1.28  1997/08/02 18:45:01  curt
+# Renamed GLmain.c GLUTmain.c
+#
+# Revision 1.27  1997/07/31 22:52:39  curt
+# Working on redoing internal coordinate systems & scenery transformations.
+#
+# Revision 1.26  1997/07/30 16:12:42  curt
+# Moved fg_random routines from Util/ to Math/
+#
 # Revision 1.25  1997/07/20 02:19:11  curt
 # First stab at a system to generate os2 makefiles automatically.
 #