Minor tweaks and fixes for cygwin32.

[flightgear.git] / Simulator / make.inc

diff --git a/Simulator/make.inc b/Simulator/make.inc
index 048d79555dde77bf70c048d67503538fc9c89745..94b7fd85579dd33c46b962f56cfda374fa4e82d0 100644 (file)
--- a/Simulator/make.inc
+++ b/Simulator/make.inc
@@ -29,9 +29,9 @@
 # Define the version
 #---------------------------------------------------------------------------
 
-VERSION_MAJOR = 0
-VERSION_MINOR = 14
-VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
+FG_VERSION_MAJOR = 0
+FG_VERSION_MINOR = 24
+FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR)
 
 
 #---------------------------------------------------------------------------
@@ -43,7 +43,9 @@ FLEX = flex -f -L
 BISON = bison -v --no-lines
 AR = ar
 RANLIB = ranlib
+RM = rm
 LN = ln -sf
+TAR = tar
 
 
 #---------------------------------------------------------------------------
@@ -60,9 +62,11 @@ LN = ln -sf
 #
 # -O3 -fomit-frame-pointer -funroll-all-loops -ffast-math
 #              - Other potential compiler optimization flags
+#
+# -
 #---------------------------------------------------------------------------
 
-GLOBAL_CFLAGS = -g -Wall -DVERSION=\"$(VERSION)\"
+GLOBAL_CFLAGS = -Wall -DVERSION=\"$(FG_VERSION)\"
 
 
 #---------------------------------------------------------------------------
@@ -86,6 +90,17 @@ GLOBAL_CFLAGS = -g -Wall -DVERSION=\"$(VERSION)\"
 #---------------------------------------------------------------------------
 
 
+#---------------------------------------------------------------------------
+# Debugging options.
+#
+# Uncomment the following two lines to enable OpenGL function call tracing.
+# This mechanism is provided courtesy of Steve Baker <sbaker@link.com>
+#---------------------------------------------------------------------------
+
+# FG_DEBUG_FLAGS = -DXGL_TRACE
+# FG_DEBUG_LIBS = ../XGL/libXGL.a
+
+
 #---------------------------------------------------------------------------
 # Uncomment one of the following sections depending on your system
 #
@@ -93,6 +108,18 @@ GLOBAL_CFLAGS = -g -Wall -DVERSION=\"$(VERSION)\"
 # on your environment:
 #---------------------------------------------------------------------------
 
+#---------------------------------------------------------------------------
+# Linux/Mesa with the GLUT toolkit
+#
+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) $(FG_DEBUG_FLAGS)
+#---------------------------------------------------------------------------
+
 #---------------------------------------------------------------------------
 # SGI IRIX with the GLUT toolkit 
 #     (Surprisingly, this also works on our SunOS 4.x machine with the 
@@ -102,19 +129,20 @@ GLOBAL_CFLAGS = -g -Wall -DVERSION=\"$(VERSION)\"
 # INTERFACE_LIBS = -lglut
 # INTERFACE_FILES = GLUTmain.c GLUTkey.c
 # GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11
-# FG_CFLAGS = $(GLOBAL_CFLAGS)
+# FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
+# TAR = gtar
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
-# Linux/Mesa with the GLUT toolkit
+# Sun/Solaris with the GLUT toolkit
 #
-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)
+# VERSION=\"$(VERSION)\"
+# INTERFACE_FLAGS = -DGLUT
+# INTERFACE_LIBS = -lglut
+# INTERFACE_FILES = GLUTmain.c GLUTkey.c
+# GRAPHICS_LIBS =  -L/opt/X11R6/lib -lGLU -lGL -lXext -lXmu -lXi -lX11 -lsocket
+# FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
+# TAR = gtar
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
@@ -124,13 +152,54 @@ FG_CFLAGS = $(GLOBAL_CFLAGS)
 # INTERFACE_LIBS = ../Win32/libglut.a
 # INTERFACE_FILES = GLUTmain.c GLUTkey.c
 # GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32
-# FG_CFLAGS = $(GLOBAL_CFLAGS) -DWIN32 -DUSE_RAND
-# LN = copy
+# FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS) -DWIN32 -DUSE_RAND
+# LN = cp
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.32  1998/01/19 18:35:40  curt
+# Minor tweaks and fixes for cygwin32.
+#
+# Revision 1.31  1998/01/08 02:21:46  curt
+# Version 0.23
+#
+# Revision 1.30  1998/01/06 01:20:03  curt
+# Version 0.21 -> 0.22
+#
+# Revision 1.29  1998/01/05 18:44:33  curt
+# Add an option to advance/decrease time from keyboard.
+#
+# Revision 1.28  1997/12/30 23:08:50  curt
+# Version 0.21
+#
+# Revision 1.27  1997/12/30 20:47:08  curt
+# Version 0.20
+#
+# Revision 1.26  1997/12/17 23:13:18  curt
+# Changes and tweaks to go to version 0.19 (Plus tweaks to Solaris support)
+#
+# Revision 1.25  1997/12/15 23:54:26  curt
+# Add xgl wrappers for debugging.
+# Generate terrain normals on the fly.
+#
+# Revision 1.24  1997/12/12 21:41:24  curt
+# More light/material property tweaking ... still a ways off.
+#
+# Revision 1.23  1997/12/12 19:52:32  curt
+# Solaris tweaks.
+#
+# Revision 1.22  1997/12/11 04:43:53  curt
+# Fixed sun vector and lighting problems.  I thing the moon is now lit
+# correctly.
+#
+# Revision 1.21  1997/12/10 01:19:42  curt
+# Tweaks for verion 0.15 release.
+#
+# Revision 1.20  1997/12/09 04:25:25  curt
+# Working on adding a global lighting params structure.
+#
 # Revision 1.19  1997/11/25 19:25:27  curt
 # Changes to integrate Durk's moon/sun code updates + clean up.
 #