From eb6d356b5f20caea4aef1db93c791fd2e3ae6dbd Mon Sep 17 00:00:00 2001 From: ben Date: Mon, 30 Dec 2002 13:43:19 +0000 Subject: [PATCH] More cleanup to Mac build procedures, notably: - Remove an unused library from the CFM-68K link line. - Set the fragment name in CFM builds to "PuTTY". - Set the hasBundle and isShared bits on freshly-created applications. git-svn-id: svn://svn.tartarus.org/sgt/putty@2383 cda61777-01e9-0310-a592-d414129be87e --- mkfiles.pl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mkfiles.pl b/mkfiles.pl index 5ed32918..cea4eb8d 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -596,7 +596,7 @@ COptions_68K = {COptions} -model far -opt space COptions_CFM68K = {COptions} -model cfmSeg -opt time COptions_PPC = {COptions} -opt size -LinkOptions = -c 'pTTY' +LinkOptions = -c 'pTTY' -fragname PuTTY LinkOptions_68K = {LinkOptions} -br 68k -model far -compact LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact LinkOptions_PPC = {LinkOptions} @@ -618,8 +618,7 @@ Libs_CFM = "{SharedLibraries}InterfaceLib" \xb6 -weaklib UnicodeConverter Libs_CFM68K = {Libs_CFM} \xb6 - "{CFM68KLibraries}NuMacRuntime.o" \xb6 - "{CFM68KLibraries}NuMathLib.o" + "{CFM68KLibraries}NuMacRuntime.o" Libs_PPC = {Libs_CFM} \xb6 "{PPCLibraries}StdCRuntime.o" \xb6 @@ -638,17 +637,20 @@ foreach $p (&prognames("M")) { $objstr = &objects($p, "X.68k.o", undef, undef); print &splitline("$prog.68k \xc4 $objstr", undef, "\xb6"), "\n"; print &splitline("\tILink -o {Targ} {LinkOptions_68K} " . - $objstr . " {Libs_68K}", 69, "\xb6"), "\n\n"; + $objstr . " {Libs_68K}", 69, "\xb6"), "\n"; + print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n"; $objstr = &objects($p, "X.cfm68k.o", undef, undef); print &splitline("$prog.cfm68k \xc4 $objstr", undef, "\xb6"), "\n"; print &splitline("\tILink -o {Targ} {LinkOptions_CFM68K} " . - $objstr . " {Libs_CFM68K}", 69, "\xb6"), "\n\n"; + $objstr . " {Libs_CFM68K}", 69, "\xb6"), "\n"; + print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n"; $objstr = &objects($p, "X.ppc.o", undef, undef); print &splitline("$prog.ppc \xc4 $objstr", undef, "\xb6"), "\n"; print &splitline("\tPPCLink -o {Targ} {LinkOptions_PPC} " . - $objstr . " {Libs_PPC}", 69, "\xb6"), "\n\n"; + $objstr . " {Libs_PPC}", 69, "\xb6"), "\n"; + print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n"; } foreach $d (&deps("X.68k.o", undef, "::", ":")) { print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}), -- 2.11.0