Add xgl wrappers for debugging.

[flightgear.git] / Simulator / make.inc

diff --git a/Simulator/make.inc b/Simulator/make.inc
index 12d4196a113bd45e479a787d5eae19b48a1f7eb7..78c22c80b611d6f2ec2390574e0f0d5c94d152f1 100644 (file)
--- a/Simulator/make.inc
+++ b/Simulator/make.inc
@@ -25,7 +25,14 @@
 #---------------------------------------------------------------------------
 
 
-VERSION = 0.08
+#---------------------------------------------------------------------------
+# Define the version
+#---------------------------------------------------------------------------
+
+FG_VERSION_MAJOR = 0
+FG_VERSION_MINOR = 18
+FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR)
+
 
 #---------------------------------------------------------------------------
 # Choose your weapons
@@ -36,6 +43,7 @@ FLEX = flex -f -L
 BISON = bison -v --no-lines
 AR = ar
 RANLIB = ranlib
+LN = ln -sf
 
 
 #---------------------------------------------------------------------------
@@ -50,9 +58,13 @@ RANLIB = ranlib
 #
 # -O2          - Enable compiler optimization
 #
+# -O3 -fomit-frame-pointer -funroll-all-loops -ffast-math
+#              - Other potential compiler optimization flags
+#
+# -
 #---------------------------------------------------------------------------
 
-GLOBAL_CFLAGS = -g -Wall 
+GLOBAL_CFLAGS = -g -Wall -DVERSION=\"$(FG_VERSION)\"
 
 
 #---------------------------------------------------------------------------
@@ -76,6 +88,17 @@ GLOBAL_CFLAGS = -g -Wall
 #---------------------------------------------------------------------------
 
 
+#---------------------------------------------------------------------------
+# 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
 #
@@ -83,6 +106,18 @@ GLOBAL_CFLAGS = -g -Wall
 # 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 
@@ -90,21 +125,20 @@ 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)
+# FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
-# Linux/Mesa with the GLUT toolkit
+# Sun/Solaris 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)
+# VERSION=\"$(VERSION)\"
+# INTERFACE_FLAGS = -DGLUT
+# INTERFACE_LIBS = -lglut
+# INTERFACE_FILES = GLUTmain.c GLUTkey.c
+# GRAPHICS_LIBS =  -lGLU -lGL -lXext -lXmu -lXi -lX11
+# FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
@@ -112,14 +146,62 @@ FG_CFLAGS = $(GLOBAL_CFLAGS)
 #
 # INTERFACE_FLAGS = -DGLUT 
 # INTERFACE_LIBS = ../Win32/libglut.a
-# INTERFACE_FILES = GLUTkey.c
+# INTERFACE_FILES = GLUTmain.c GLUTkey.c
 # GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32
-# FG_CFLAGS = $(GLOBAL_CFLAGS) -DWIN32 -DUSE_RAND
+# FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS) -DWIN32 -DUSE_RAND
+# LN = copy
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# 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.
+#
+# Revision 1.18  1997/10/28 19:35:41  curt
+# Organizational changes.
+#
+# Revision 1.17  1997/10/25 03:30:02  curt
+# Misc. tweaks.
+#
+# Revision 1.16  1997/10/25 03:24:21  curt
+# Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
+#
+# Revision 1.15  1997/09/23 00:29:27  curt
+# Tweaks to get things to compile with gcc-win32.
+#
+# Revision 1.14  1997/09/16 22:14:47  curt
+# Tweaked time of day lighting equations.  Don't draw stars during the day.
+#
+# 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.
 #