summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2015-06-20 20:44:17 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2015-06-20 20:47:35 +0200
commit465eb727a30fd1f4470ff6c172f7b41856775167 (patch)
treef6eac6d54ede4f9b50226062b557a4de8abbd48b /tools
parent226922efe3791c3b7cb06c893e18b694f7390865 (diff)
downloadrockbox-465eb727a30fd1f4470ff6c172f7b41856775167.tar.gz
rockbox-465eb727a30fd1f4470ff6c172f7b41856775167.tar.bz2
rockbox-465eb727a30fd1f4470ff6c172f7b41856775167.zip
Fix rebuilding librbspeex on OS X and make rm work on Windows.
OS X ar operates on fat libaries and cannot update existing archives. Remove it first to avoid this. Use a make function when removing files to allow calling the correct command on Windows, which doesn't know about rm. Change-Id: Ia0c13ef7907239a1e6f4abc26bb08238a226c476
Diffstat (limited to 'tools')
-rw-r--r--tools/rbspeex/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile
index 89e21f8022..a4f337f455 100644
--- a/tools/rbspeex/Makefile
+++ b/tools/rbspeex/Makefile
@@ -13,8 +13,10 @@ endif
ifeq ($(OS),Windows_NT)
mkdir = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1))
+rm = if exist $(subst /,\,$(1)) del /q /s $(subst /,\,$(1))
else
mkdir = mkdir -p $(1)
+rm = rm -rf $(1)
endif
SPEEXSRC = ../../lib/rbcodec/codecs/libspeex
@@ -100,6 +102,7 @@ $(TARGET_DIR)rbspeex.dll: $(OBJS) $(BUILD_DIR)/rbspeex.o
$(TARGET_DIR)librbspeex.a: $(OBJS) $(BUILD_DIR)/rbspeex.o
@echo AR $(notdir $@)
+ $(SILENT)$(call rm,$@)
$(SILENT)$(CROSS)$(AR) rcs $@ $^
librbspeex.a: $(TARGET_DIR)librbspeex.a
@@ -119,9 +122,9 @@ librbspeex.a: $(TARGET_DIR)librbspeex.a
$(SILENT)$(CROSS)$(CC) $(CFLAGS) $(ARCHFLAGS) -c $< -o $@
clean:
- rm -f $(OBJS) $(TARGET_DIR)librbspeex* ../rbspeexenc ../rbspeexdec
- rm -f $(DEPS)
- rm -rf build*
+ $(call rm,$(OBJS) $(TARGET_DIR)librbspeex* ../rbspeexenc ../rbspeexdec)
+ $(call rm,$(DEPS))
+ $(call rm,build*)
$(BUILD_DIR):
@echo MKDIR $(BUILD_DIR)