summaryrefslogtreecommitdiff
path: root/rbutil/libtools.make
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 /rbutil/libtools.make
parent302937e586ea44ed72e0485ef9e6732027ea9164 (diff)
downloadrockbox-ded02d82e7bb8e1ff18b1bbe29c40cb9f885d26e.tar.gz
rockbox-ded02d82e7bb8e1ff18b1bbe29c40cb9f885d26e.zip
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
Diffstat (limited to 'rbutil/libtools.make')
-rw-r--r--rbutil/libtools.make16
1 files changed, 2 insertions, 14 deletions
diff --git a/rbutil/libtools.make b/rbutil/libtools.make
index 0d028e09be..b3015015ed 100644
--- a/rbutil/libtools.make
+++ b/rbutil/libtools.make
@@ -121,20 +121,8 @@ clean:
121 rm -rf $(OUTPUT)-* i386 ppc $(OBJDIR) 121 rm -rf $(OUTPUT)-* i386 ppc $(OBJDIR)
122 122
123# OS X specifics 123# OS X specifics
124$(OUTPUT)-i386: 124$(OUTPUT).dmg: $(OUTPUT)
125 $(MAKE) RBARCH=i386
126 mv $(OUTPUT) $@
127
128$(OUTPUT)-ppc:
129 $(MAKE) RBARCH=ppc
130 mv $(OUTPUT) $@
131
132$(OUTPUT)-mac: $(OUTPUT)-i386 $(OUTPUT)-ppc
133 @echo LIPO $@
134 $(SILENT)lipo -create $(OUTPUT)-ppc $(OUTPUT)-i386 -output $@
135
136$(OUTPUT).dmg: $(OUTPUT)-mac
137 @echo DMG $@ 125 @echo DMG $@
138 $(SILENT)mkdir -p $(OUTPUT)-dmg 126 $(SILENT)mkdir -p $(OUTPUT)-dmg
139 $(SILENT)cp -p $(OUTPUT)-mac $(OUTPUT)-dmg 127 $(SILENT)cp -p $(OUTPUT) $(OUTPUT)-dmg
140 $(SILENT)hdiutil create -srcfolder $(OUTPUT)-dmg $@ 128 $(SILENT)hdiutil create -srcfolder $(OUTPUT)-dmg $@