diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-12-16 18:59:38 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-12-16 18:59:38 +0000 |
| commit | 98becd207623718b851c44d919077f51e338a5c5 (patch) | |
| tree | bc097f127179ddf4468068a7c4cd5796504eca14 | |
| parent | b056e027fc49305672a594916cc12e84c85872be (diff) | |
| download | rockbox-98becd207623718b851c44d919077f51e338a5c5.tar.gz rockbox-98becd207623718b851c44d919077f51e338a5c5.zip | |
mkamsboot: fix building as universal library.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31325 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | rbutil/libtools.make | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/libtools.make b/rbutil/libtools.make index a74e54eb78..43ef3d9386 100644 --- a/rbutil/libtools.make +++ b/rbutil/libtools.make | |||
| @@ -27,7 +27,7 @@ ifndef APPVERSION | |||
| 27 | APPVERSION=$(shell $(TOP)/../tools/version.sh ../) | 27 | APPVERSION=$(shell $(TOP)/../tools/version.sh ../) |
| 28 | endif | 28 | endif |
| 29 | CFLAGS += -DVERSION=\"$(APPVERSION)\" | 29 | CFLAGS += -DVERSION=\"$(APPVERSION)\" |
| 30 | TARGET_DIR ?= $(shell pwd)/ | 30 | TARGET_DIR = $(shell pwd)/ |
| 31 | 31 | ||
| 32 | BINARY = $(OUTPUT) | 32 | BINARY = $(OUTPUT) |
| 33 | # when building a Windows binary add the correct file suffix | 33 | # when building a Windows binary add the correct file suffix |
| @@ -113,8 +113,8 @@ endif | |||
| 113 | 113 | ||
| 114 | lib$(OUTPUT)-universal: $(TARGET_DIR)lib$(OUTPUT)i386.a \ | 114 | lib$(OUTPUT)-universal: $(TARGET_DIR)lib$(OUTPUT)i386.a \ |
| 115 | $(TARGET_DIR)lib$(OUTPUT)ppc.a | 115 | $(TARGET_DIR)lib$(OUTPUT)ppc.a |
| 116 | @echo lipo $(TARGET_DIR)libmkamsboot.a | 116 | @echo LIPO $(notdir $(TARGET_DIR)lib$(OUTPUT).a) |
| 117 | $(SILENT) rm -f $(TARGET_DIR)libmkamsboot.a | 117 | $(SILENT) rm -f $(TARGET_DIR)lib$(OUTPUT).a |
| 118 | $(SILENT)lipo -create $(TARGET_DIR)lib$(OUTPUT)i386.a \ | 118 | $(SILENT)lipo -create $(TARGET_DIR)lib$(OUTPUT)i386.a \ |
| 119 | $(TARGET_DIR)lib$(OUTPUT)ppc.a \ | 119 | $(TARGET_DIR)lib$(OUTPUT)ppc.a \ |
| 120 | -output $(TARGET_DIR)lib$(OUTPUT).a | 120 | -output $(TARGET_DIR)lib$(OUTPUT).a |