zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 00:15:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update the OS X makefile so I can build on Lion. Regrettably that

Browse Source 
means I have to withdraw support for OS X 10.3 and PPC.

[originally from svn r9494]
This commit is contained in:
Simon Tatham
2012-05-06 11:35:59 +00:00
parent 8b96f9b996
commit 14da5088e8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mkfiles.pl
View File

@ -1411,7 +1411,7 @@ if (defined $makefiles{'nestedvm'}) {
if (defined $makefiles{'osx'}) { if (defined $makefiles{'osx'}) {
$mftyp = 'osx'; $mftyp = 'osx';
$dirpfx = &dirpfx($makefiles{'osx'}, "/"); $dirpfx = &dirpfx($makefiles{'osx'}, "/");
@osxarchs = ('ppc', 'i386'); @osxarchs = ('i386');
##-- Mac OS X makefile ##-- Mac OS X makefile
open OUT, ">$makefiles{'osx'}"; select OUT; open OUT, ">$makefiles{'osx'}"; select OUT;
@ -1460,7 +1460,7 @@ if (defined $makefiles{'osx'}) {
foreach $arch (@osxarchs) { foreach $arch (@osxarchs) {
$objstr = &objects($p, "X.${arch}.o", undef, undef); $objstr = &objects($p, "X.${arch}.o", undef, undef);
print &splitline("${prog}.${arch}.bin: " . $objstr), "\n"; print &splitline("${prog}.${arch}.bin: " . $objstr), "\n";
print &splitline("\t\$(CC) -arch ${arch} -mmacosx-version-min=10.3 \$(LDFLAGS) -o \$@ " . print &splitline("\t\$(CC) -arch ${arch} -mmacosx-version-min=10.4 \$(LDFLAGS) -o \$@ " .
$objstr . " $libstr", 69), "\n\n"; $objstr . " $libstr", 69), "\n\n";
$archbins .= " ${prog}.${arch}.bin"; $archbins .= " ${prog}.${arch}.bin";
} }
@ -1475,7 +1475,7 @@ if (defined $makefiles{'osx'}) {
foreach $arch (@osxarchs) { foreach $arch (@osxarchs) {
$objstr = &objects($p, "X.${arch}.o", undef, undef); $objstr = &objects($p, "X.${arch}.o", undef, undef);
print &splitline("${prog}.${arch}: " . $objstr), "\n"; print &splitline("${prog}.${arch}: " . $objstr), "\n";
print &splitline("\t\$(CC) -arch ${arch} -mmacosx-version-min=10.3 \$(ULDFLAGS) -o \$@ " . print &splitline("\t\$(CC) -arch ${arch} -mmacosx-version-min=10.4 \$(ULDFLAGS) -o \$@ " .
$objstr . " $libstr", 69), "\n\n"; $objstr . " $libstr", 69), "\n\n";
$archbins .= " ${prog}.${arch}"; $archbins .= " ${prog}.${arch}";
} }
@ -1488,10 +1488,10 @@ if (defined $makefiles{'osx'}) {
"\n"; "\n";
$deflist = join "", map { " -D$_" } @{$d->{defs}}; $deflist = join "", map { " -D$_" } @{$d->{defs}};
if ($d->{deps}->[0] =~ /\.m$/) { if ($d->{deps}->[0] =~ /\.m$/) {
print "\t\$(CC) -arch $arch -mmacosx-version-min=10.3 -x objective-c \$(COMPAT) \$(FWHACK) \$(CFLAGS)". print "\t\$(CC) -arch $arch -mmacosx-version-min=10.4 -x objective-c \$(COMPAT) \$(FWHACK) \$(CFLAGS)".
" \$(XFLAGS)$deflist -c \$< -o \$\@\n"; " \$(XFLAGS)$deflist -c \$< -o \$\@\n";
} else { } else {
print "\t\$(CC) -arch $arch -mmacosx-version-min=10.3 \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS)$deflist" . print "\t\$(CC) -arch $arch -mmacosx-version-min=10.4 \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS)$deflist" .
" -c \$< -o \$\@\n"; " -c \$< -o \$\@\n";
} }
} }