darkkirb/buildtools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1 from mtheall/master

Browse source 
Allow TITLE to be used for app title; fallback to NAME
This commit is contained in:
Steven Smith 2016-01-29 15:06:01 -08:00
commit 6bc6b4e431
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
make_base
View file

@ -31,6 +31,10 @@ EMPTY :=
SPACE := $(EMPTY) $(EMPTY) SPACE := $(EMPTY) $(EMPTY)
STRIPPED_NAME := $(subst $(SPACE),,$(NAME)) STRIPPED_NAME := $(subst $(SPACE),,$(NAME))
ifeq ($(strip $(TITLE)),)
TITLE := $(NAME)
endif
REMOTE_IP ?= 127.0.0.1 # User-defined REMOTE_IP ?= 127.0.0.1 # User-defined
ifeq ($(LIBRARY),1) ifeq ($(LIBRARY),1)
@ -102,7 +106,7 @@ ifeq ($(TARGET),3DS)
ROMFS_PARAM := -DAPP_ROMFS="RootPath: $(ROMFS_DIR)" ROMFS_PARAM := -DAPP_ROMFS="RootPath: $(ROMFS_DIR)"
endif endif
COMMON_MAKEROM_PARAMS := -rsf $(RSF) -target t -exefslogo -icon $(BUILD_DIR)/icon.icn -banner $(BUILD_DIR)/banner.bnr -DAPP_TITLE="$(NAME)" -DAPP_PRODUCT_CODE="$(PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(UNIQUE_ID)" $(ROMFS_PARAM) -DAPP_SYSTEM_MODE="$(SYSTEM_MODE)" -DAPP_SYSTEM_MODE_EXT="$(SYSTEM_MODE_EXT)" COMMON_MAKEROM_PARAMS := -rsf $(RSF) -target t -exefslogo -icon $(BUILD_DIR)/icon.icn -banner $(BUILD_DIR)/banner.bnr -DAPP_TITLE="$(TITLE)" -DAPP_PRODUCT_CODE="$(PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(UNIQUE_ID)" $(ROMFS_PARAM) -DAPP_SYSTEM_MODE="$(SYSTEM_MODE)" -DAPP_SYSTEM_MODE_EXT="$(SYSTEM_MODE_EXT)"
BIN2S := $(DEVKITARM)/bin/bin2s BIN2S := $(DEVKITARM)/bin/bin2s
SMDHTOOL := $(DEVKITARM)/bin/smdhtool SMDHTOOL := $(DEVKITARM)/bin/smdhtool
@ -260,11 +264,11 @@ $(BUILD_DIR)/%.shbin.o: %.shlist
%.icn: $(ICON) %.icn: $(ICON)
@echo $@ @echo $@
@$(BANNERTOOL) makesmdh -s "$(NAME)" -l "$(DESCRIPTION)" -p "$(AUTHOR)" -i $(ICON) -o $@ > /dev/null @$(BANNERTOOL) makesmdh -s "$(TITLE)" -l "$(DESCRIPTION)" -p "$(AUTHOR)" -i $(ICON) -o $@ > /dev/null
%.smdh: $(ICON) %.smdh: $(ICON)
@echo $@ @echo $@
@$(SMDHTOOL) --create "$(NAME)" "$(DESCRIPTION)" "$(AUTHOR)" $(ICON) $@ @$(SMDHTOOL) --create "$(TITLE)" "$(DESCRIPTION)" "$(AUTHOR)" $(ICON) $@
$(OUTPUT_DIR)/3ds/$(STRIPPED_NAME)/%.3dsx: $(OUTPUT_DIR)/%.elf $(OUTPUT_DIR)/3ds/$(STRIPPED_NAME)/%.smdh $(OUTPUT_DIR)/3ds/$(STRIPPED_NAME)/%.3dsx: $(OUTPUT_DIR)/%.elf $(OUTPUT_DIR)/3ds/$(STRIPPED_NAME)/%.smdh
@echo $@ @echo $@