Shufflin' stuff.

[flightgear.git] / Simulator / make.inc

diff --git a/Simulator/make.inc b/Simulator/make.inc
index e7e8e92d3672df72056b0578a0e6df84e508d1e2..705be7e8382201cd8f127ef91dab058a62cb78b6 100644 (file)
--- a/Simulator/make.inc
+++ b/Simulator/make.inc
@@ -25,7 +25,7 @@
 #---------------------------------------------------------------------------
 
 
-VERSION = 0.07
+VERSION = 0.11
 
 #---------------------------------------------------------------------------
 # Choose your weapons
@@ -52,7 +52,7 @@ RANLIB = ranlib
 #
 #---------------------------------------------------------------------------
 
-GLOBAL_CFLAGS = -g -Wall 
+GLOBAL_CFLAGS = -g -Wall -DVERSION=\"$(VERSION)\"
 
 
 #---------------------------------------------------------------------------
@@ -90,7 +90,7 @@ GLOBAL_CFLAGS = -g -Wall
 #
 # INTERFACE_FLAGS = -DGLUT
 # INTERFACE_LIBS = -lglut
-# INTERFACE_FILES = GLUTkey.c
+# INTERFACE_FILES = GLUTmain.c GLUTkey.c
 # GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11
 # FG_CFLAGS = $(GLOBAL_CFLAGS)
 #---------------------------------------------------------------------------
@@ -98,28 +98,43 @@ 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 = GLUTmain.c 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 = GLUTmain.c GLUTkey.c
+# GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32
+# FG_CFLAGS = $(GLOBAL_CFLAGS) -DWIN32 -DUSE_RAND
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.13  1997/09/04 02:17:19  curt
+# Shufflin' stuff.
+#
+# Revision 1.12  1997/08/25 20:27:21  curt
+# Merged in initial HUD and Joystick code.
+#
+# Revision 1.11  1997/08/22 21:34:33  curt
+# Doing a bit of reorganizing and house cleaning.
+#
+# Revision 1.10  1997/08/16 12:22:19  curt
+# Tweaks for new version.
+#
+# 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.
 #