We routinely compile with both VS2003 and 2015.

[PuTTY.git] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 166ee1328e184d2253e4c110a3be004e5c1cef9d..4a2b3b4dcca8182a8091e884310541315349f871 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -47,8 +47,8 @@ open IN, "Recipe" or do {
 # HACK: One of the source files in `charset' is auto-generated by
 # sbcsgen.pl, and licence.h is likewise generated by licence.pl. We
 # need to generate those _now_, before attempting dependency analysis.
-eval 'chdir "charset"; require "sbcsgen.pl"; chdir ".."; select STDOUT;';
-eval 'require "licence.pl"; select STDOUT;';
+eval 'chdir "charset"; require "./sbcsgen.pl"; chdir ".."; select STDOUT;';
+eval 'require "./licence.pl"; select STDOUT;';
 
 @srcdirs = ("./");
 
@@ -646,7 +646,7 @@ if (defined $makefiles{'vc'}) {
       "CFLAGS = /nologo /W3 /O1 " .
       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
       " /D_WINDOWS /D_WIN32_WINDOWS=0x500 /DWINVER=0x500 /D_CRT_SECURE_NO_WARNINGS\n".
-      "LFLAGS = /incremental:no /fixed\n".
+      "LFLAGS = /incremental:no /dynamicbase /nxcompat\n".
       "RCFLAGS = ".(join " ", map {"-I$dirpfx$_"} @srcdirs).
       " -DWIN32 -D_WIN32 -DWINVER=0x0400\n".
       "\n".
@@ -676,7 +676,7 @@ if (defined $makefiles{'vc'}) {
            print "$objlines[$i]\n";
        }
        print "<<\n";
-       print "\tlink \$(LFLAGS) \$(XLFLAGS) -out:\$(BUILDDIR)$prog.exe -map:\$(BUILDDIR)$prog.map -nologo -subsystem:$subsys \@$inlinefilename\n\n";
+       print "\tlink \$(LFLAGS) \$(XLFLAGS) -out:\$(BUILDDIR)$prog.exe -map:\$(BUILDDIR)$prog.map -nologo -subsystem:$subsys\$(SUBSYSVER) \@$inlinefilename\n\n";
     }
     foreach $d (&deps("\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res", $dirpfx, "\\", "vc")) {
         $extradeps = $forceobj{$d->{obj_orig}} ? ["*.c","*.h","*.rc"] : [];