devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix rebuilding librbspeex on OS X and make rm work on Windows.

Browse source 
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
This commit is contained in:
Dominik Riebeling 2015-06-20 20:44:17 +02:00
parent 226922efe3
commit 465eb727a3
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tools/rbspeex/Makefile
View file

@ -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)