1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 19:42:48 -05:00

Build process tweaks -- now only runs Rez over mac_res.r once.

[originally from svn r152]
This commit is contained in:
Ben Harris
1999-04-02 10:21:49 +00:00
parent 60b6897f17
commit d5f4dd719a
2 changed files with 32 additions and 33 deletions

View File

@ -1,4 +1,4 @@
# $Id: Makefile.mpw,v 1.1.2.8 1999/04/01 21:25:06 ben Exp $
# $Id: Makefile.mpw,v 1.1.2.9 1999/04/02 10:21:48 ben Exp $
# This is the Makefile for building PuTTY for the Mac OS.
# Users of non-Mac systems will see some pretty strange characters around.
@ -12,11 +12,6 @@ COptions = {Includes} {Sym
# disable "unused parameter" warnings
PPCCOptions = {Includes} {Sym<EFBFBD>PPC} -w 35
# short names for targets
68k <EFBFBD> PuTTY
ppc <EFBFBD> PuTTY.ppc
fat <EFBFBD> PuTTY.fat
Objects<EFBFBD>68K = <20>
mac.c.o <20>
maccfg.c.o <20>
@ -67,48 +62,52 @@ all
clean <EFBFBD>
delete -i {Objects<EFBFBD>68K} {Objects<EFBFBD>PPC} <EFBFBD>
PuTTY PuTTY.fat PuTTY.ppc PuTTY.NJ
# short names for targets
68k <EFBFBD> PuTTY.68k
ppc <EFBFBD> PuTTY.ppc
fat <EFBFBD> PuTTY
PuTTY.ppc <EFBFBD><EFBFBD> {<EFBFBD>MondoBuild<EFBFBD>} {Objects<EFBFBD>PPC}
PuTTY.rsrc <EFBFBD> mac_res.r macresid.h
Rez mac_res.r -o {Targ} {Includes}
PuTTY.ppc <EFBFBD> {Objects<EFBFBD>PPC} PuTTY.rsrc
Delete -i {Targ}
PPCLink <EFBFBD>
-o {Targ} {Sym<EFBFBD>PPC} <EFBFBD>
-t 'APPL' <EFBFBD>
-c 'pTTY' <EFBFBD>
-t 'APPL' -c 'pTTY' <EFBFBD>
-fragname PuTTY <EFBFBD>
{Objects<EFBFBD>PPC} <EFBFBD>
{Libs<EFBFBD>PPC}
Echo 'Include "PuTTY.rsrc";' > merge.r
Rez merge.r -o {Targ} -append
Delete -i merge.r
Rez version.r -d BUILD_ARCH='"PowerPC"' -o {Targ} {Includes} -append
PuTTY <EFBFBD><EFBFBD> {Objects<EFBFBD>68K} {Libs<EFBFBD>68K}
PuTTY.68k <EFBFBD><EFBFBD> {Objects<EFBFBD>68K} {Libs<EFBFBD>68K}
IF (`exists {Targ}.NJ`)
ILink <EFBFBD>
-o {Targ} {Sym<EFBFBD>68K} <EFBFBD>
-t 'APPL' <EFBFBD>
-c 'pTTY' <EFBFBD>
-t 'APPL' -c 'pTTY' <EFBFBD>
-newerdeps {NewerDeps}
ELSE
ILink <EFBFBD>
-o {Targ} {Sym<EFBFBD>68K} <EFBFBD>
-t 'APPL' <EFBFBD>
-c 'pTTY' <EFBFBD>
-t 'APPL' -c 'pTTY' <EFBFBD>
{Objects<EFBFBD>68K} <EFBFBD>
{Libs<EFBFBD>68K}
END
PuTTY <EFBFBD><EFBFBD> mac_res.r macresid.h
Rez mac_res.r -o {Targ} {Includes} -append
PuTTY.68k <EFBFBD><EFBFBD> PuTTY.rsrc
Echo 'Include "PuTTY.rsrc";' > merge.r
Rez merge.r -o {Targ} -append
Delete -i merge.r
Rez version.r -d BUILD_ARCH='"68k"' -o {Targ} {Includes} -append
PuTTY <EFBFBD><EFBFBD> version.r version.h
Rez mac_res.r -d BUILD_ARCH='"68k"' -o {Targ} {Includes} -append
PuTTY.ppc <EFBFBD><EFBFBD> {<EFBFBD>MondoBuild<EFBFBD>} mac_res.r macresid.h
Rez mac_res.r -o {Targ} {Includes} -append
PuTTY.ppc <EFBFBD><EFBFBD> version.r version.h
Rez mac_res.r -d BUILD_ARCH='"PowerPC"' -o {Targ} {Includes} -append
PuTTY.fat <EFBFBD> PuTTY PuTTY.ppc version.r version.h
Duplicate -y PuTTY PuTTY.fat
MergeFragment PuTTY.ppc PuTTY.fat
Rez mac_res.r -d BUILD_ARCH='"fat"' -o {Targ} {Includes} -append
PuTTY <EFBFBD> PuTTY.68k PuTTY.ppc version.r version.h
Duplicate -y PuTTY.68k {Targ}
MergeFragment PuTTY.ppc {Targ}
Rez version.r -d BUILD_ARCH='"fat"' -o {Targ} {Includes} -append
.c.o <EFBFBD> .c
{C} {default}.c -o {Targ} {COptions}

View File

@ -1,15 +1,15 @@
# $Id: mkputty.mpw,v 1.1.2.6 1999/03/28 15:23:37 ben Exp $
# $Id: mkputty.mpw,v 1.1.2.7 1999/04/02 10:21:49 ben Exp $
set program "{1}"
shift
if "{program}" == "" || "{program}" == "68k"
set program PuTTY
set program PuTTY.68k
end
if "{program}" == "ppc"
set program PuTTY.ppc
end
if "{program}" == "fat"
set program PuTTY.fat
set program PuTTY
end
Set makefile Makefile.mpw