Define SECURITY_WIN32 for Winelib/Cygwin builds as well as for VC.

[sgt/putty] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 830de49..c87ae4e 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -88,7 +88,9 @@ while (<IN>) {
   }
   if ($_[0] eq "!forceobj") { $forceobj{$_[1]} = 1; next; }
   if ($_[0] eq "!begin") {
-      if (&mfval($_[1])) {
+      if ($_[1] =~ /^>(.*)/) {
+         $divert = \$auxfiles{$1};
+      } elsif (&mfval($_[1])) {
           $sect = $_[2] ? $_[2] : "end";
          $divert = \($makefile_extra{$_[1]}->{$sect});
       } else {
@@ -145,6 +147,12 @@ while (<IN>) {
 
 close IN;
 
+foreach $aux (sort keys %auxfiles) {
+    open AUX, ">$aux";
+    print AUX $auxfiles{$aux};
+    close AUX;
+}
+
 # Now retrieve the complete list of objects and resource files, and
 # construct dependency data for them. While we're here, expand the
 # object list for each program, and complain if its type isn't set.
@@ -476,7 +484,7 @@ if (defined $makefiles{'cygwin'}) {
                          join " ", @{$d->{deps}})), "\n";
       }
       if ($d->{obj} =~ /\.res\.o$/) {
-         print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n";
+         print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." -o ".$d->{obj}."\n\n";
       } else {
          print "\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c ".$d->{deps}->[0]."\n\n";
       }
@@ -1147,7 +1155,7 @@ if (defined $makefiles{'am'}) {
       $objtosrc{$d->{obj}} = $d->{deps}->[0];
     }
 
-    @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", map {"-I$dirpfx$_"} @srcdirs);
+    @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", "\$(WARNINGOPTS)", map {"-I$dirpfx$_"} @srcdirs);
     print "if HAVE_GTK\n";
     print &splitline(join " ", "AM_CFLAGS", "=",
                      "\$(GTK_CFLAGS)", @amcflags), "\n";