tweaks

diff --git a/Aircraft/depend b/Aircraft/depend
index fc10b018c8bfa43306024750eb5777b8918fa522..5de52b7c6e3e0e8871e13a5d6aab0d7844fa16c7 100644 (file)
--- a/Aircraft/depend
+++ b/Aircraft/depend
@@ -1,4 +1,4 @@
 aircraft.o: aircraft.c aircraft.h ../Flight/flight.h \
  ../Flight/Slew/slew.h ../Flight/LaRCsim/ls_interface.h \
  ../Flight/LaRCsim/../flight.h ../Controls/controls.h \
- ../Controls/../limits.h
+ ../Controls/../limits.h ../constants.h

diff --git a/Simulator/README b/Simulator/README
index f8543dd97410c478360a315a9886c14fb187b6f7..f60aeeb716592074de2a30cd3370a4748b9af2fd 100644 (file)
--- a/Simulator/README
+++ b/Simulator/README
@@ -1,8 +1,9 @@
+majordomo writes:
 Subdirectories
 ==============
 OpenGL/
 -------
-"main" and OpenGL dependent mouse/keyboard/graphics code.
+"main()" and OpenGL dependent mouse/keyboard/graphics code.
 
 
 Aircraft/
@@ -42,6 +43,16 @@ Timer/
 Code to handle time and timing of events.
 
 
+Utils/
+------
+Miscellaneous utility routines such as a general random number generator
+
+
 Weather/
 --------
 Weather management and modeling code.
+
+
+Win32/
+------
+Win32 support stuff

diff --git a/Simulator/make.inc b/Simulator/make.inc
index e7e8e92d3672df72056b0578a0e6df84e508d1e2..406cea7196393a5965af9a844a1e53370a154667 100644 (file)
--- a/Simulator/make.inc
+++ b/Simulator/make.inc
@@ -98,28 +98,31 @@ GLOBAL_CFLAGS = -g -Wall
 #---------------------------------------------------------------------------
 # Linux/Mesa with the GLUT toolkit
 #
-# INTERFACE_FLAGS = -DGLUT
-# INTERFACE_LIBS = -lglut
-# INTERFACE_FILES = GLUTkey.c
-# 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)
-# FG_CFLAGS = $(GLOBAL_CFLAGS)
+INTERFACE_FLAGS = -DGLUT
+INTERFACE_LIBS = -lglut
+INTERFACE_FILES = GLUTkey.c
+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)
+FG_CFLAGS = $(GLOBAL_CFLAGS)
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
 # Cygnus Win32 (gcc based) with a static version of the GLUT toolkit
 #
-INTERFACE_FLAGS = -DGLUT 
-INTERFACE_LIBS = ../Win32/libglut.a
-INTERFACE_FILES = GLUTkey.c
-GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32
-FG_CFLAGS = $(GLOBAL_CFLAGS) -DWIN32 -DUSE_RAND
+# INTERFACE_FLAGS = -DGLUT 
+# INTERFACE_LIBS = ../Win32/libglut.a
+# INTERFACE_FILES = GLUTkey.c
+# GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32
+# FG_CFLAGS = $(GLOBAL_CFLAGS) -DWIN32 -DUSE_RAND
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.9  1997/07/19 22:41:35  curt
+# tweaks
+#
 # Revision 1.8  1997/07/18 23:41:20  curt
 # Tweaks for building with Cygnus Win32 compiler.
 #