X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=mkfiles.pl;h=f4365198ef47eed8fd497008193de27010c6b3ee;hb=5471539a6738484b48fb938c88dce547a3e4b299;hp=977bcef47673af2d0ef890e3c5a22484357194f4;hpb=4d8782e74fed043fdf549718f99494622fe9e79b;p=PuTTY.git
diff --git a/mkfiles.pl b/mkfiles.pl
index 977bcef4..f4365198 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -461,7 +461,7 @@ if (defined $makefiles{'cygwin'}) {
&splitline("RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1 ".
"--define WINVER=0x0400 ".(join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
"\n".
- $makefile_extra{'cygwin'}->{'vars'} .
+ &def($makefile_extra{'cygwin'}->{'vars'}) .
"\n".
".SUFFIXES:\n".
"\n";
@@ -491,7 +491,7 @@ if (defined $makefiles{'cygwin'}) {
}
}
print "\n";
- print $makefile_extra{'cygwin'}->{'end'} if defined $makefile_extra{'cygwin'}->{'end'};
+ print &def($makefile_extra{'cygwin'}->{'end'});
print "\nclean:\n".
"\trm -f *.o *.exe *.res.o *.so *.map\n".
"\n".
@@ -540,7 +540,7 @@ if (defined $makefiles{'borland'}) {
"BCB = \$(MAKEDIR)\\..\n".
"!endif\n".
"\n".
- $makefile_extra{'borland'}->{'vars'} .
+ &def($makefile_extra{'borland'}->{'vars'}) .
"\n".
".c.obj:\n".
&splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)".
@@ -597,7 +597,7 @@ if (defined $makefiles{'borland'}) {
}
}
print "\n";
- print $makefile_extra{'borland'}->{'end'} if defined $makefile_extra{'borland'}->{'end'};
+ print &def($makefile_extra{'borland'}->{'end'});
print "\nclean:\n".
"\t-del *.obj\n".
"\t-del *.exe\n".
@@ -639,7 +639,7 @@ if (defined $makefiles{'vc'}) {
"RCFLAGS = ".(join " ", map {"-I$dirpfx$_"} @srcdirs).
" -DWIN32 -D_WIN32 -DWINVER=0x0400\n".
"\n".
- $makefile_extra{'vc'}->{'vars'} .
+ &def($makefile_extra{'vc'}->{'vars'}) .
"\n".
"\n";
print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("G:C"));
@@ -680,7 +680,7 @@ if (defined $makefiles{'vc'}) {
}
}
print "\n";
- print $makefile_extra{'vc'}->{'end'} if defined $makefile_extra{'vc'}->{'end'};
+ print &def($makefile_extra{'vc'}->{'end'});
print "\nclean: tidy\n".
"\t-del *.exe\n\n".
"tidy:\n".
@@ -1159,7 +1159,7 @@ if (defined $makefiles{'vstudio10'} || defined $makefiles{'vstudio12'}) {
" true\n" .
" Level3\n" .
" " . (join ";", map {"..\\..\\$dirpfx$_"} @srcdirs) . ";%(AdditionalIncludeDirectories)\n" .
- " WIN32;NDEBUG;_WINDOWS;SECURITY_WIN32;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)\n" .
+ " WIN32;NDEBUG;_WINDOWS;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)\n" .
" .\\Release\\\n" .
" .\\Release\\$windows_project.pch\n" .
" .\\Release\\\n" .
@@ -1198,7 +1198,7 @@ if (defined $makefiles{'vstudio10'} || defined $makefiles{'vstudio12'}) {
" true\n" .
" ProgramDatabase\n" .
" " . (join ";", map {"..\\..\\$dirpfx$_"} @srcdirs) . ";%(AdditionalIncludeDirectories)\n" .
- " WIN32;_DEBUG;_WINDOWS;SECURITY_WIN32;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)\n" .
+ " WIN32;_DEBUG;_WINDOWS;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)\n" .
" .\\Debug\\\n" .
" .\\Debug\\$windows_project.pch\n" .
" .\\Debug\\\n" .
@@ -1398,7 +1398,7 @@ if (defined $makefiles{'gtk'}) {
print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n");
}
print "\n";
- print $makefile_extra{'gtk'}->{'end'};
+ print &def($makefile_extra{'gtk'}->{'end'});
print "\nclean:\n".
"\trm -f *.o". (join "", map { " $_" } &progrealnames("X:U")) . "\n";
print "\nFORCE:\n";
@@ -1561,7 +1561,7 @@ if (defined $makefiles{'am'}) {
print "endif\n" if $type eq "X";
print "\n";
}
- print $makefile_extra{'am'}->{'end'};
+ print &def($makefile_extra{'am'}->{'end'});
select STDOUT; close OUT;
}
@@ -1592,7 +1592,7 @@ if (defined $makefiles{'lcc'}) {
"\n".
"# Get include directory for resource compiler\n".
"\n".
- $makefile_extra{'lcc'}->{'vars'} .
+ &def($makefile_extra{'lcc'}->{'vars'}) .
"\n";
print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("G:C"));
print "\n\n";
@@ -1623,7 +1623,7 @@ if (defined $makefiles{'lcc'}) {
}
}
print "\n";
- print $makefile_extra{'lcc'}->{'end'} if defined $makefile_extra{'lcc'}->{'end'};
+ print &def($makefile_extra{'lcc'}->{'end'});
print "\nclean:\n".
"\t-del *.obj\n".
"\t-del *.exe\n".
@@ -1654,7 +1654,7 @@ if (defined $makefiles{'osx'}) {
"MLDFLAGS = -framework Cocoa\n".
"ULDFLAGS =\n".
"\n" .
- $makefile_extra{'osx'}->{'vars'} .
+ &def($makefile_extra{'osx'}->{'vars'}) .
"\n" .
&splitline("all:" . join "", map { " $_" } &progrealnames("MX:U")) .
"\n";