Add xgl wrappers for debugging.

[flightgear.git] / Simulator / Makefile

diff --git a/Simulator/Makefile b/Simulator/Makefile
index 01a2cbaac4a42157be126c3182afabaefed6bde4..f07b102e323af35dfd8db28685c45c46ea478637 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -28,8 +28,9 @@ include make.inc
 
 
 SUBSUBDIRS = Flight/LaRCsim Flight/Slew
-SUBDIRS = Aircraft Cockpit Controls Flight Joystick Math Scenery Time Weather
-MAIN = GLUT
+SUBDIRS = Aircraft Cockpit Controls Flight Joystick Math Scenery Time Weather \
+         XGL
+MAIN = Main
 
 
 all: 
@@ -60,38 +61,57 @@ clean:
 
 source-tar: clean
        (cd ../..; \
-       tar cvzf source-$(VERSION).tar.gz FlightGear/fgtop FlightGear/COPYING \
-       FlightGear/Docs FlightGear/Src FlightGear/Thanks)
+       tar cvzf source-$(FG_VERSION).tar.gz FlightGear/fgtop \
+       FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Thanks)
 
 source-zip: clean
        (cd ../..; \
-       zip -r source-$(VERSION).zip FlightGear/fgtop FlightGear/COPYING \
-       FlightGear/Docs FlightGear/Src FlightGear/Thanks)
+       zip -r source-$(FG_VERSION).zip FlightGear/fgtop 
+       FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Thanks)
 
 scenery-tar:
        (cd ../..; \
-       tar cvzf scenery-$(VERSION).tar.gz FlightGear/Scenery)
+       tar cvzf scenery-$(FG_VERSION).tar.gz FlightGear/Scenery)
 
 scenery-zip:
        (cd ../..; \
-       zip -r scenery-$(VERSION).zip FlightGear/Scenery)
+       zip -r scenery-$(FG_VERSION).zip FlightGear/Scenery)
 
 bin-tar: all
-       cp GLUT/fg0 GLUT/runfg ..
+       cp Main/fg-$(FG_VERSION) runfg ..
+       $(LN) ../fg-$(FG_VERSION) ../fg$(FG_VERSION_MAJOR)
        (cd ../..; \
-       tar cvzf bin-$(VERSION).tar.gz FlightGear/fgtop FlightGear/fg0 \
+       tar cvzf bin-$(FG_VERSION).tar.gz FlightGear/fgtop \
+       FlightGear/fg-$(FG_VERSION) FlightGear/fg$(FG_VERSION_MAJOR) \
        FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/Thanks)
 
 bin-zip: 
-       cp GLUT/fg0.exe GLUT/runfg.bat GLUT/cygwin.dll ..
+       cp Main/fg$(FG_VERSION_MAJOR).exe Main/cygwin.dll runfg.bat ..
        (cd ../..; \
-       zip -r bin-$(VERSION).zip FlightGear/fgtop FlightGear/fg0.exe \
-       FlightGear/runfg.bat FlightGear/cygwin.dll FlightGear/COPYING \
-       FlightGear/Docs FlightGear/Thanks)
+       zip -r bin-$(FG_VERSION).zip FlightGear/fgtop \
+       FlightGear/fg$(FG_VERSION_MAJOR).exe FlightGear/runfg.bat \
+       FlightGear/cygwin.dll FlightGear/COPYING FlightGear/Docs \
+       FlightGear/Thanks)
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.32  1997/12/15 23:54:25  curt
+# Add xgl wrappers for debugging.
+# Generate terrain normals on the fly.
+#
+# Revision 1.31  1997/12/15 20:59:08  curt
+# Misc. tweaks.
+#
+# Revision 1.30  1997/12/10 01:19:42  curt
+# Tweaks for verion 0.15 release.
+#
+# Revision 1.29  1997/10/30 12:38:35  curt
+# Working on new scenery subsystem.
+#
+# Revision 1.28  1997/10/28 19:35:40  curt
+# Organizational changes.
+#
 # Revision 1.27  1997/09/23 00:29:27  curt
 # Tweaks to get things to compile with gcc-win32.
 #