Tons of little changes to clean up the code and to remove fatal errors

[flightgear.git] / Simulator / make.inc

diff --git a/Simulator/make.inc b/Simulator/make.inc
index 78c22c80b611d6f2ec2390574e0f0d5c94d152f1..0aa2b1599762600d7e2c40cbfeb1cc3759de8dc9 100644 (file)
--- a/Simulator/make.inc
+++ b/Simulator/make.inc
@@ -30,7 +30,7 @@
 #---------------------------------------------------------------------------
 
 FG_VERSION_MAJOR = 0
-FG_VERSION_MINOR = 18
+FG_VERSION_MINOR = 24
 FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR)
 
 
@@ -38,12 +38,14 @@ FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR)
 # Choose your weapons
 #---------------------------------------------------------------------------
 
-CC = gcc
+CC = g++
 FLEX = flex -f -L
 BISON = bison -v --no-lines
 AR = ar
 RANLIB = ranlib
+RM = rm
 LN = ln -sf
+TAR = tar
 
 
 #---------------------------------------------------------------------------
@@ -64,7 +66,7 @@ LN = ln -sf
 # -
 #---------------------------------------------------------------------------
 
-GLOBAL_CFLAGS = -g -Wall -DVERSION=\"$(FG_VERSION)\"
+GLOBAL_CFLAGS = -Wall -DVERSION=\"$(FG_VERSION)\"
 
 
 #---------------------------------------------------------------------------
@@ -128,6 +130,7 @@ FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
 # INTERFACE_FILES = GLUTmain.c GLUTkey.c
 # GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11
 # FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
+# TAR = gtar
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
@@ -137,8 +140,9 @@ FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
 # INTERFACE_FLAGS = -DGLUT
 # INTERFACE_LIBS = -lglut
 # INTERFACE_FILES = GLUTmain.c GLUTkey.c
-# GRAPHICS_LIBS =  -lGLU -lGL -lXext -lXmu -lXi -lX11
+# GRAPHICS_LIBS =  -L/opt/X11R6/lib -lGLU -lGL -lXext -lXmu -lXi -lX11 -lsocket
 # FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
+# TAR = gtar
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
@@ -149,12 +153,37 @@ FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
 # INTERFACE_FILES = GLUTmain.c GLUTkey.c
 # GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32
 # FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS) -DWIN32 -DUSE_RAND
-# LN = copy
+# LN = cp
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.33  1998/01/19 18:40:15  curt
+# Tons of little changes to clean up the code and to remove fatal errors
+# when building with the c++ compiler.
+#
+# 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.