Fix xxd failing to run when path has spaces

This commit is contained in:
usagirei 2016-05-21 20:55:08 -03:00 committed by Steven Smith
parent 019dc85fcc
commit 1ab55c4815

View file

@ -269,7 +269,7 @@ define shader-as
$(eval CURBIN := $(patsubst %.shbin.c,%.shbin,$@)) $(eval CURBIN := $(patsubst %.shbin.c,%.shbin,$@))
$(PICASSO) -o $(CURBIN) $1 $(PICASSO) -o $(CURBIN) $1
@cd $(dir $(CURBIN)); \ @cd $(dir $(CURBIN)); \
xxd -i $(notdir $(CURBIN)) $(CURDIR)/$@ xxd -i $(notdir $(CURBIN)) "$(CURDIR)/$@"
echo "extern const u8" `(echo $(notdir $(CURBIN)) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h echo "extern const u8" `(echo $(notdir $(CURBIN)) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h
echo "extern const u32" `(echo $(notdir $(CURBIN)) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_len";" >> `(echo $(CURBIN) | tr . _)`.h echo "extern const u32" `(echo $(notdir $(CURBIN)) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_len";" >> `(echo $(CURBIN) | tr . _)`.h
endef endef
@ -443,7 +443,7 @@ $(BUILD_DIR)/%.bin.o: $(BUILD_DIR)/%.bin.c
$(BUILD_DIR)/%.bin.c: %.bin $(BUILD_DIR)/%.bin.c: %.bin
@echo $@ @echo $@
@cd $(<D); \ @cd $(<D); \
xxd -i $(<F) $(CURDIR)/$@ xxd -i $(<F) "$(CURDIR)/$@"
@echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(BUILD_DIR)/$< | tr . _)`.h @echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(BUILD_DIR)/$< | tr . _)`.h
@echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_len";" >> `(echo $(BUILD_DIR)/$< | tr . _)`.h @echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_len";" >> `(echo $(BUILD_DIR)/$< | tr . _)`.h