Fix picasso path.

This commit is contained in:
Steven Smith 2016-02-14 21:44:09 -08:00
parent 45803422e8
commit d5e6f91389

View file

@ -68,6 +68,7 @@ ifeq ($(TARGET),3DS)
CXX := $(DEVKITARM)/bin/arm-none-eabi-g++ CXX := $(DEVKITARM)/bin/arm-none-eabi-g++
BIN2S := $(DEVKITARM)/bin/bin2s BIN2S := $(DEVKITARM)/bin/bin2s
PICASSO := $(DEVKITARM)/bin/picasso
SMDHTOOL := $(DEVKITARM)/bin/smdhtool SMDHTOOL := $(DEVKITARM)/bin/smdhtool
_3DSXTOOL := $(DEVKITARM)/bin/3dsxtool _3DSXTOOL := $(DEVKITARM)/bin/3dsxtool
_3DSLINK := $(DEVKITARM)/bin/3dslink _3DSLINK := $(DEVKITARM)/bin/3dslink
@ -180,7 +181,7 @@ $(BUILD_DIR)/%.bin.o: %.bin
define shader-as define shader-as
$(eval CURBIN := $(patsubst %.shbin.o,%.shbin,$@)) $(eval CURBIN := $(patsubst %.shbin.o,%.shbin,$@))
picasso -o $(CURBIN) $1 $(PICASSO) -o $(CURBIN) $1
$(BIN2S) $(CURBIN) | $(AS) -o $@ $(BIN2S) $(CURBIN) | $(AS) -o $@
echo "extern const u8" `(echo $(notdir $(CURBIN)) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h echo "extern const u8" `(echo $(notdir $(CURBIN)) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(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 u8" `(echo $(notdir $(CURBIN)) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h