nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Switch to producing .res files, not .res.o.

Browse Source 
I've just upgraded my build process to a version of lld-link
that knows how to read .res, and I think it's a slightly more
commonly found format, so less confusing to encounter.
This commit is contained in:
Simon Tatham 2017-08-26 15:23:56 +01:00
parent 55efbc56a0
commit a459fc58e8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mkfiles.pl
View File

@ -556,10 +556,10 @@ if (defined $makefiles{'clangcl'}) {
print "\n\n"; print "\n\n";
foreach $p (&prognames("G:C")) { foreach $p (&prognames("G:C")) {
($prog, $type) = split ",", $p; ($prog, $type) = split ",", $p;
$objstr = &objects($p, "\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res.o", undef); $objstr = &objects($p, "\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res", undef);
print &splitline("\$(BUILDDIR)$prog.exe: " . $objstr), "\n"; print &splitline("\$(BUILDDIR)$prog.exe: " . $objstr), "\n";
$objstr = &objects($p, "\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res.o", "X.lib"); $objstr = &objects($p, "\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res", "X.lib");
$subsys = ($type eq "G") ? "windows" : "console"; $subsys = ($type eq "G") ? "windows" : "console";
print &splitline("\t\$(LD) \$(LFLAGS) \$(XLFLAGS) ". print &splitline("\t\$(LD) \$(LFLAGS) \$(XLFLAGS) ".
"/out:\$(BUILDDIR)$prog.exe ". "/out:\$(BUILDDIR)$prog.exe ".
@ -567,11 +567,11 @@ if (defined $makefiles{'clangcl'}) {
"/subsystem:$subsys\$(SUBSYSVER) ". "/subsystem:$subsys\$(SUBSYSVER) ".
"\$(EXTRA_$subsys) $objstr")."\n\n"; "\$(EXTRA_$subsys) $objstr")."\n\n";
} }
foreach $d (&deps("\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res.o", $dirpfx, "/", "vc")) { foreach $d (&deps("\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res", $dirpfx, "/", "vc")) {
$extradeps = $forceobj{$d->{obj_orig}} ? ["*.c","*.h","*.rc"] : []; $extradeps = $forceobj{$d->{obj_orig}} ? ["*.c","*.h","*.rc"] : [];
print &splitline(sprintf("%s: %s", $d->{obj}, print &splitline(sprintf("%s: %s", $d->{obj},
join " ", @$extradeps, @{$d->{deps}})), "\n"; join " ", @$extradeps, @{$d->{deps}})), "\n";
if ($d->{obj} =~ /\.res\.o$/) { if ($d->{obj} =~ /\.res$/) {
print "\t\$(RC) \$(RCFLAGS) ".$d->{deps}->[0]." -o ".$d->{obj}."\n\n"; print "\t\$(RC) \$(RCFLAGS) ".$d->{deps}->[0]." -o ".$d->{obj}."\n\n";
} else { } else {
print "\t\$(CC) /Fo\$(BUILDDIR) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) /c \$<\n\n"; print "\t\$(CC) /Fo\$(BUILDDIR) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) /c \$<\n\n";
@ -581,7 +581,7 @@ if (defined $makefiles{'clangcl'}) {
print &def($makefile_extra{'clangcl'}->{'end'}); print &def($makefile_extra{'clangcl'}->{'end'});
print "\nclean:\n". print "\nclean:\n".
&splitline("\trm -f \$(BUILDDIR)*.obj \$(BUILDDIR)*.exe ". &splitline("\trm -f \$(BUILDDIR)*.obj \$(BUILDDIR)*.exe ".
"\$(BUILDDIR)*.res.o \$(BUILDDIR)*.map ". "\$(BUILDDIR)*.res \$(BUILDDIR)*.map ".
"\$(BUILDDIR)*.exe.manifest")."\n"; "\$(BUILDDIR)*.exe.manifest")."\n";
select STDOUT; close OUT; select STDOUT; close OUT;
} }