# md5sum readily available. We do, however, have `md5 -r' which
# generates _nearly_ the same output, but it has no check function.
!begin osx
-version.o: FORCE;
+version.ppc.o: FORCE;
FORCE:
if test -z "$(VER)" && test -f manifest && (md5 -r `awk '{print $$2}' manifest` | diff -w manifest -); then \
- $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c; \
+ $(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c -o version.ppc.o; \
elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
- $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c; \
+ $(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c -o version.ppc.o; \
else \
- $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c; \
+ $(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c -o version.ppc.o; \
+ fi
+version.i386.o: FORCE2;
+FORCE2:
+ if test -z "$(VER)" && test -f manifest && (md5 -r `awk '{print $$2}' manifest` | diff -w manifest -); then \
+ $(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c -o version.i386.o; \
+ elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
+ $(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c -o version.i386.o; \
+ else \
+ $(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c -o version.i386.o; \
fi
!end
!specialobj osx version
if (defined $makefiles{'osx'}) {
$mftyp = 'osx';
$dirpfx = &dirpfx($makefiles{'osx'}, "/");
+ @osxarchs = ('ppc', 'i386');
##-- Mac OS X makefile
open OUT, ">$makefiles{'osx'}"; select OUT;
print $_;
print
"CC = \$(TOOLPATH)gcc\n".
+ "LIPO = \$(TOOLPATH)lipo\n".
"\n".
&splitline("CFLAGS = -O2 -Wall -Werror -g " .
(join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
print "\n\n";
foreach $p (&prognames("MX")) {
($prog, $type) = split ",", $p;
- $objstr = &objects($p, "X.o", undef, undef);
$icon = &special($p, ".icns");
$infoplist = &special($p, "info.plist");
print "${prog}.app:\n\tmkdir -p \$\@\n";
}
$targets .= " \$(${prog}_extra)";
print &splitline("${prog}: $targets", 69) . "\n\n";
- print &splitline("${prog}.app/Contents/MacOS/$prog: ".
- "${prog}.app/Contents/MacOS " . $objstr), "\n";
$libstr = &objects($p, undef, undef, "-lX");
- print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " .
+ $archbins = "";
+ 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 \$@ " .
$objstr . " $libstr", 69), "\n\n";
+ $archbins .= " ${prog}.${arch}.bin";
+ }
+ print &splitline("${prog}.app/Contents/MacOS/$prog: ".
+ "${prog}.app/Contents/MacOS" . $archbins), "\n";
+ print &splitline("\t\$(LIPO) -create $archbins -output \$@", 69), "\n\n";
}
foreach $p (&prognames("U")) {
($prog, $type) = split ",", $p;
- $objstr = &objects($p, "X.o", undef, undef);
- print &splitline($prog . ": " . $objstr), "\n";
$libstr = &objects($p, undef, undef, "-lX");
- print &splitline("\t\$(CC)" . $mw . " \$(ULDFLAGS) -o \$@ " .
- $objstr . " $libstr", 69), "\n\n";
+ $archbins = "";
+ 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 \$@ " .
+ $objstr . " $libstr", 69), "\n\n";
+ $archbins .= " ${prog}.${arch}";
+ }
+ print &splitline("${prog}:" . $archbins), "\n";
+ print &splitline("\t\$(LIPO) -create $archbins -output \$@", 69), "\n\n";
}
- foreach $d (&deps("X.o", undef, $dirpfx, "/")) {
- print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
- "\n";
- $deflist = join "", map { " -D$_" } @{$d->{defs}};
- if ($d->{deps}->[0] =~ /\.m$/) {
- print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(CFLAGS)".
- " \$(XFLAGS)$deflist -c \$< -o \$\@\n";
- } else {
- print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS)$deflist" .
- " -c \$< -o \$\@\n";
+ foreach $arch (@osxarchs) {
+ foreach $d (&deps("X.${arch}.o", undef, $dirpfx, "/")) {
+ print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
+ "\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)".
+ " \$(XFLAGS)$deflist -c \$< -o \$\@\n";
+ } else {
+ print "\t\$(CC) -arch $arch -mmacosx-version-min=10.3 \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS)$deflist" .
+ " -c \$< -o \$\@\n";
+ }
}
}
print "\nclean:\n".
- "\trm -f *.o *.dmg". (join "", map { " $_" } &progrealnames("U")) . "\n".
+ "\trm -f *.o *.dmg". (join "", map { my $a=$_; (" $a", map { " ${a}.$_" } @osxarchs) } &progrealnames("U")) . "\n".
"\trm -rf *.app\n";
select STDOUT; close OUT;
}