Organizational tweaking.

diff --git a/Main/GLUTmain.c b/Main/GLUTmain.c
index 2e51bcaccee6236443175e1ec7fa4868ebfbb4e1..904fb3e4e402c522d1e5ec6647101588c1346a8f 100644 (file)
--- a/Main/GLUTmain.c
+++ b/Main/GLUTmain.c
@@ -33,10 +33,6 @@
 #ifdef GLUT
     #include <GL/glut.h>
     #include "GLUTkey.h"
-#elif MESA_TK
-    /* assumes -I/usr/include/mesa in compile command */
-    #include "gltk.h"
-    #include "GLTKkey.h"
 #endif
 
 #include "../constants.h"
@@ -242,8 +238,6 @@ static void fgUpdateVisuals( void ) {
 
     #ifdef GLUT
       glutSwapBuffers();
-    #elif MESA_TK
-      tkSwapBuffers();
     #endif
 }
 
@@ -414,6 +408,7 @@ static void fgMainLoop( void ) {
     fgUpdateVisuals();
 
     if ( ! use_signals ) {
+       /* flight model */
        fgUpdateTimeDepCalcs(multi_loop);
     }
 
@@ -491,18 +486,6 @@ int main( int argc, char *argv[] ) {
 
       /* Initialize windows */
       glutCreateWindow("Flight Gear");
-
-    #elif MESA_TK
-      /* Define initial window size */
-      tkInitPosition(0, 0, 640, 480);
-
-      /* Define Display Parameters */
-      tkInitDisplayMode( TK_RGB | TK_DEPTH | TK_DOUBLE | TK_DIRECT );
-
-      /* Initialize the main window */
-      if (tkInitWindow("Flight Gear") == GL_FALSE) {
-         tkQuit();
-      }
     #endif
 
     /* seed the random number generater */
@@ -623,42 +606,26 @@ int main( int argc, char *argv[] ) {
 
       /* pass control off to the GLUT event handler */
       glutMainLoop();
-    #elif MESA_TK
-      /* call fgReshape() on expose events */
-      tkExposeFunc( fgReshape );
-
-      /* call fgReshape() on window resizes */
-      tkReshapeFunc( fgReshape );
-
-      /* call key() on keyboard event */
-      tkKeyDownFunc( GLTKkey );
-
-      /* call fgMainLoop() whenever there is nothing else to do */
-      tkIdleFunc( fgMainLoop );
-
-      /* draw the scene */
-      tkDisplayFunc( fgUpdateVisuals );
-
-      /* pass control off to the tk event handler */
-      tkExec();
     #endif
 
     return(0);
 }
 
-#ifdef NO_PRINTF
-
-#include <stdarg.h>
-int printf (const char *format, ...) {
-}
 
+#ifdef NO_PRINTF
+  #include <stdarg.h>
+  int printf (const char *format, ...) {
+  }
 #endif
 
 
 /* $Log$
-/* Revision 1.1  1997/08/02 18:45:00  curt
-/* Renamed GLmain.c GLUTmain.c
+/* Revision 1.2  1997/08/04 20:25:15  curt
+/* Organizational tweaking.
 /*
+ * Revision 1.1  1997/08/02 18:45:00  curt
+ * Renamed GLmain.c GLUTmain.c
+ *
  * Revision 1.43  1997/08/02 16:23:47  curt
  * Misc. tweaks.
  *

diff --git a/Main/Makefile b/Main/Makefile
index 1e44ab2cf15f81d80164d1aac9ff1a11c22442aa..8c8dca03b90d1a1a9d1bafa1b18e82dd8ec81e0d 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -26,13 +26,12 @@
 
 TARGET=fg0
 
-CFILES = GLUTmain.c $(INTERFACE_FILES) mesh2GL.c
+CFILES = GLUTmain.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 \
-       ../Time/libTime.a ../Weather/libWeather.a
+       ../Flight/Slew/libSlew.a ../Scenery/libScenery.a \
+       ../Time/libTime.a ../Weather/libWeather.a ../Math/libMath.a 
 
 
 include ../make.inc
@@ -70,12 +69,12 @@ GLUTkey.o:
 GLTKkey.o:
        $(CC) $(CFLAGS) -c GLTKkey.c -o $@
 
-mesh2GL.o:
-       $(CC) $(CFLAGS) -c mesh2GL.c -o $@
-
 
 #---------------------------------------------------------------------------
 # $Log$
+# 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
 #

diff --git a/Main/depend b/Main/depend
index 9d73b07c2a5f7a2ab45bf58f452ed7e9ac74f7f5..98e04a03c3bcde2b1864afa0fc0afe98830570f2 100644 (file)
--- a/Main/depend
+++ b/Main/depend
@@ -20,6 +20,3 @@ GLmain.o: GLmain.c ../constants.h ../Aircraft/aircraft.h \
  ../Scenery/scenery.h ../Math/fg_random.h ../Math/mat3.h \
  ../Math/polar.h ../Math/../types.h ../Time/fg_timer.h \
  ../Weather/weather.h
-mesh2GL.o: mesh2GL.c ../constants.h ../Scenery/mesh.h \
- ../Scenery/scenery.h ../Math/fg_geodesy.h ../Math/fg_random.h \
- ../Math/mat3.h ../Math/polar.h ../Math/../types.h