Misc. configuration tweaks.

diff --git a/Simulator/Makefile b/Simulator/Makefile
index 072b4b05010ff4158c23abe288a8065842d7de7a..2afccb4f4a2a25c8a5fae625332fa3501921c26f 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -40,7 +40,7 @@ all:
 depend:
        for dir in $(ORDEREDDIRS); do \
            ( echo "Making depend in $$dir"; \
-             cd $$dir; $(CC) $(CFLAGS) -M *.c > depend ) ; \
+             cd $$dir; $(CC) $(CFLAGS) $(CCDEPFLAG) *.c > depend ) ; \
        done
 
 Makefile-os2:
@@ -117,6 +117,9 @@ bin-exp-zip:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.44  1998/03/09 22:52:53  curt
+# Misc. configuration tweaks.
+#
 # Revision 1.43  1998/02/19 13:05:43  curt
 # Incorporated some HUD tweaks from Michelle America.
 # Tweaked the sky's sunset/rise colors.

diff --git a/Simulator/Thanks b/Simulator/Thanks
index 070d4ae9e08e7c49c920ec24988f47332783f99d..9706424d19bb800b88dacc7666d5f2e43c14ce7d 100644 (file)
--- a/Simulator/Thanks
+++ b/Simulator/Thanks
@@ -36,6 +36,11 @@ Gene Buckle <geneb@nwlink.com>
   a good hard shove.) :-)
 
 
+Didier Chauveau <chauveau@math.univ-mlv.fr>
+  Provided some initial code to parse the 30 arcsec DEM files found at:
+  http://edcwww.cr.usgs.gov/landdaac/gtopo30/gtopo30.html
+
+
 Michael I. Gold <gold@puck.asd.sgi.com> -- Patiently answered my endless
   "newbie" OpenGL questions.  His effort alone has made me a great SGI
   fan.

diff --git a/Simulator/commondefs b/Simulator/commondefs
index 186bf017fed248b537424f93eb446bf0e35ae2e4..144d04c0c8a21a0806a9c0279fd3b25c50db7cee 100644 (file)
--- a/Simulator/commondefs
+++ b/Simulator/commondefs
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 
 FG_VERSION_MAJOR = 0
-FG_VERSION_MINOR = 36
+FG_VERSION_MINOR = 37
 FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR)
 
 
@@ -15,6 +15,8 @@ FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR)
 
 CC = g++
 CXX = g++
+CCDEPFLAG = -M
+
 LD = ld
 AR = ar
 RANLIB = ranlib
@@ -47,7 +49,7 @@ TAR = tar
 #
 #---------------------------------------------------------------------------
 
-GLOBAL_CFLAGS = -Wall -DVERSION=\"$(FG_VERSION)\"
+GLOBAL_CFLAGS = -g -Wall -DVERSION=\"$(FG_VERSION)\"
 
 
 #---------------------------------------------------------------------------
@@ -162,7 +164,7 @@ CDEFS = $(LCDEFS)
 CFLAGS = $(FG_CFLAGS) -I$(FG_ROOT_SRC) $(LCFLAGS)
 
 CXXDEFS = $(LCXXDEFS)
-CXXFLAGS = $(FG_CFLAGS) $(LCXXFLAGS)
+CXXFLAGS = $(CFLAGS)
 
 LDDEFS = $(LLDDEFS)
 LDFLAGS = $(LLDFLAGS) -L$(FG_ROOT_LIB)

diff --git a/Simulator/commonrules b/Simulator/commonrules
index 7c7c9793595401a13ff0b27988c1d6eb61c8271d..0421feb25a1d3ec266cb6dd26fa94f1663564e5f 100644 (file)
--- a/Simulator/commonrules
+++ b/Simulator/commonrules
@@ -19,10 +19,10 @@ depend: $(DEPENDS)
        cat $(DEPENDS) > $(MAKEDEPENDFILE)
 
 .cxx.d:
-       $(CPP) $(CPPFLAGS) $(CPPDEFS) -c $< -MD
+       $(CXX) $(CXXFLAGS) $(CXXDEFS) -c $< -MD
 
 .cxx.o:
-       $(CPP) $(CPPFLAGS) $(CPPDEFS) -c $<
+       $(CXX) $(CXXFLAGS) $(CXXDEFS) -c $<
 
 .c.d:
        $(CC) $(CFLAGS) $(CDEFS) -c $< -MD