summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-01-06 09:24:38 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-01-06 09:24:38 +0000
commitded02d82e7bb8e1ff18b1bbe29c40cb9f885d26e (patch)
tree8c4a8c0469837793c7f3900cb7e66d9d31a37663
parent302937e586ea44ed72e0485ef9e6732027ea9164 (diff)
downloadrockbox-ded02d82e7bb8e1ff18b1bbe29c40cb9f885d26e.zip
rockbox-ded02d82e7bb8e1ff18b1bbe29c40cb9f885d26e.tar.gz
rockbox-ded02d82e7bb8e1ff18b1bbe29c40cb9f885d26e.tar.bz2
rockbox-ded02d82e7bb8e1ff18b1bbe29c40cb9f885d26e.tar.xz
Remove OS X special universal binary handling.
Since the libs are now build as universal libs there is no need anymore to create separate binaries for both architectures and run lipo on them, just build in a single run now. Fixes building universal binaries and dmg for all tools using libtools.make. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31590 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--rbutil/libtools.make16
1 files changed, 2 insertions, 14 deletions
diff --git a/rbutil/libtools.make b/rbutil/libtools.make
index 0d028e0..b301501 100644
--- a/rbutil/libtools.make
+++ b/rbutil/libtools.make
@@ -121,20 +121,8 @@ clean:
rm -rf $(OUTPUT)-* i386 ppc $(OBJDIR)
# OS X specifics
-$(OUTPUT)-i386:
- $(MAKE) RBARCH=i386
- mv $(OUTPUT) $@
-
-$(OUTPUT)-ppc:
- $(MAKE) RBARCH=ppc
- mv $(OUTPUT) $@
-
-$(OUTPUT)-mac: $(OUTPUT)-i386 $(OUTPUT)-ppc
- @echo LIPO $@
- $(SILENT)lipo -create $(OUTPUT)-ppc $(OUTPUT)-i386 -output $@
-
-$(OUTPUT).dmg: $(OUTPUT)-mac
+$(OUTPUT).dmg: $(OUTPUT)
@echo DMG $@
$(SILENT)mkdir -p $(OUTPUT)-dmg
- $(SILENT)cp -p $(OUTPUT)-mac $(OUTPUT)-dmg
+ $(SILENT)cp -p $(OUTPUT) $(OUTPUT)-dmg
$(SILENT)hdiutil create -srcfolder $(OUTPUT)-dmg $@