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 91c9e9b2d011dd257a825ec559e0a9b2cb6fe4fb..1b7f8ddc6b56986091e4fdeedae4bf377ba017b3 100644 (file)
--- a/src/Include/config.h-msvc6
+++ b/src/Include/config.h-msvc6
@@ -46,7 +46,7 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
-#define FLIGHTGEAR_VERSION "MSVC6-WIN32-0.9.1"
+#define FLIGHTGEAR_VERSION "MSVC6-WIN32-2.0.0"
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -64,7 +64,7 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
-#define VERSION "0.9.1"
+#define VERSION "2.0.0"
 
 /* Define if compiling on a Winbloze (95, NT, etc.) platform */
 #define WIN32 1
@@ -185,12 +185,14 @@
 
 #define HAVE_MEMCPY 1
 
+#define NOMINMAX 1
+
 #ifndef ENABLE_AUDIO_SUPPORT
 #define  ENABLE_AUDIO_SUPPORT
 #endif
 
-#ifndef  GLUT_H
-#define  GLUT_H   <GL/glut.h>
-#endif   // #ifndef GLUT_H
+#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