Index: source/windows/winmain.c
===================================================================
--- source/windows/winmain.c    (revision 700)
+++ source/windows/winmain.c    (working copy)
@@ -128,9 +128,7 @@
         return -1;
     }

-    p = thisfile+strlen(thisfile) - 4;
-       if (strnicmp(p, ".exe", 4) != 0)
-               strcat(thisfile, ".exe");
+    p = thisfile;

        // fill in here (directory of thisfile)
        //GetModuleFileName returns an absolute path
Index: source/windows/run.rc
===================================================================
--- source/windows/run.rc       (revision 700)
+++ source/windows/run.rc       (working copy)
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "windows.h"

 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
Index: source/windows/runw.rc
===================================================================
--- source/windows/runw.rc      (revision 700)
+++ source/windows/runw.rc      (working copy)
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "windows.h"

 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
Index: Sconstruct
===================================================================
--- Sconstruct  (revision 700)
+++ Sconstruct  (working copy)
@@ -30,7 +30,7 @@
     # - Either debug build (with debug messages) or release build.
     # - Either console program or windowed program.
     for msvs_ver in "6.0", "7.1":
-        base_env = Environment(MSVS_VERSION = msvs_ver)
+        base_env = Environment()

         for flavour in "debug", "release":
             for mode in "cons", "win":