Merge branch 'timoore/fire-fix' into next

[flightgear.git] / src / Include / config.h-msvc6

diff --git a/src/Include/config.h-msvc6 b/src/Include/config.h-msvc6
index cce3048d824666371e00016d57a8442460f5d396..1b7f8ddc6b56986091e4fdeedae4bf377ba017b3 100644 (file)
--- a/src/Include/config.h-msvc6
+++ b/src/Include/config.h-msvc6
@@ -1,5 +1,31 @@
 
-/* Special single config.h for MSVC6 build - Geoff McLane - 22 Jan, 2002  */
+/* Special single config.h for MSVC6 build - Geoff McLane - 23 July, 2003  */
+
+/* Define to enable plib joystick support */
+#ifndef  ENABLE_PLIB_JOYSTICK
+#define ENABLE_PLIB_JOYSTICK
+#endif   // #ifndef  ENABLE_PLIB_JOYSTICK
+
+/* Define to enable threaded tile paging */
+#undef ENABLE_THREADS
+
+/* Define so that JSBSim compiles in 'library' mode */
+#define FGFS 1
+
+/* Define to build with jpeg screen shot server */
+#undef FG_JPEG_SERVER
+
+/* Define for no logging output */
+#undef FG_NDEBUG
+
+/* Define to build with Oliver's networking */
+#undef FG_NETWORK_OLK
+
+/* Define to enable plib joystick name support */
+#define FG_PLIB_JOYSTICK_GETNAME
+
+/* Define to build with Christian Mayer's weather code */
+#undef FG_WEATHERCM
 
 /* Define if the X Window System is missing or not being used.  */
 #define X_DISPLAY_MISSING 1
@@ -20,7 +46,7 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
-#define FLIGHTGEAR_VERSION "MSVC6-WIN32-0.7.9"
+#define FLIGHTGEAR_VERSION "MSVC6-WIN32-2.0.0"
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -38,10 +64,7 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
-#define VERSION "0.57"
-#ifndef  FG_VERSION     /* allow override */
-#define  FG_VERSION     7
-#endif   /* FG_VERSION */
+#define VERSION "2.0.0"
 
 /* Define if compiling on a Winbloze (95, NT, etc.) platform */
 #define WIN32 1
@@ -162,8 +185,14 @@
 
 #define HAVE_MEMCPY 1
 
+#define NOMINMAX 1
+
 #ifndef ENABLE_AUDIO_SUPPORT
 #define  ENABLE_AUDIO_SUPPORT
 #endif
 
+#ifndef  FG_GLUT_H
+#define  FG_GLUT_H   <GL/glut.h>
+#endif   // #ifndef FG_GLUT_H
+
 // eof - config.h-msvc6 - single flightgear config.h file