aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2012-05-06 11:35:59 +0000
committerSimon Tatham <anakin@pobox.com>2012-05-06 11:35:59 +0000
commit14da5088e8b0238b630414ca8bfb2336299ec51c (patch)
treee83ad04b78308617bde2fa6544bf201d8d532878
parent8b96f9b99642908697a60a6b57e931cf5bce9c9c (diff)
downloadpuzzles-14da5088e8b0238b630414ca8bfb2336299ec51c.zip
puzzles-14da5088e8b0238b630414ca8bfb2336299ec51c.tar.gz
puzzles-14da5088e8b0238b630414ca8bfb2336299ec51c.tar.bz2
puzzles-14da5088e8b0238b630414ca8bfb2336299ec51c.tar.xz
Update the OS X makefile so I can build on Lion. Regrettably that
means I have to withdraw support for OS X 10.3 and PPC. [originally from svn r9494]
-rwxr-xr-xmkfiles.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/mkfiles.pl b/mkfiles.pl
index 3df8d16..dcbbede 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -1411,7 +1411,7 @@ if (defined $makefiles{'nestedvm'}) {
if (defined $makefiles{'osx'}) {
$mftyp = 'osx';
$dirpfx = &dirpfx($makefiles{'osx'}, "/");
- @osxarchs = ('ppc', 'i386');
+ @osxarchs = ('i386');
##-- Mac OS X makefile
open OUT, ">$makefiles{'osx'}"; select OUT;
@@ -1460,7 +1460,7 @@ if (defined $makefiles{'osx'}) {
foreach $arch (@osxarchs) {
$objstr = &objects($p, "X.${arch}.o", undef, undef);
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";
$archbins .= " ${prog}.${arch}.bin";
}
@@ -1475,7 +1475,7 @@ if (defined $makefiles{'osx'}) {
foreach $arch (@osxarchs) {
$objstr = &objects($p, "X.${arch}.o", undef, undef);
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";
$archbins .= " ${prog}.${arch}";
}
@@ -1488,10 +1488,10 @@ if (defined $makefiles{'osx'}) {
"\n";
$deflist = join "", map { " -D$_" } @{$d->{defs}};
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";
} 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";
}
}