The-Homebrew-Cloud/ftpiiu_plugin
2
0
Fork 0
mirror of https://github.com/wiiu-env/ftpiiu_plugin.git synced 2024-09-30 03:58:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix that pesky whitespace

Browse Source
This commit is contained in:
Michael Theall 2016-06-11 03:22:41 -05:00
parent d18ce24f59
commit aae47764c3
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Makefile.3ds
View File

@ -38,10 +38,10 @@ APP_TITLE := Super ftpd II Turbo
APP_DESCRIPTION := v$(VERSION) APP_DESCRIPTION := v$(VERSION)
APP_AUTHOR := mtheall APP_AUTHOR := mtheall
ICON := meta/icon.png ICON := meta/icon.png
BNR_IMAGE := meta/banner.png BNR_IMAGE := meta/banner.png
BNR_AUDIO := meta/audio.wav BNR_AUDIO := meta/audio.wav
RSF_FILE := meta/ftpd-cia.rsf RSF_FILE := meta/ftpd-cia.rsf
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation
@ -111,37 +111,37 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
ifeq ($(strip $(ICON)),) ifeq ($(strip $(ICON)),)
icons := $(wildcard *.png) icons := $(wildcard *.png)
ifneq (,$(findstring $(TARGET).png,$(icons))) ifneq (,$(findstring $(TARGET).png,$(icons)))
export APP_ICON := $(TOPDIR)/$(TARGET).png export APP_ICON := $(TOPDIR)/$(TARGET).png
else else
ifneq (,$(findstring icon.png,$(icons))) ifneq (,$(findstring icon.png,$(icons)))
export APP_ICON := $(TOPDIR)/icon.png export APP_ICON := $(TOPDIR)/icon.png
endif endif
endif endif
else else
export APP_ICON := $(TOPDIR)/$(ICON) export APP_ICON := $(TOPDIR)/$(ICON)
endif endif
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
endif endif
ifneq ($(ROMFS),) ifneq ($(ROMFS),)
export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS) export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS)
endif endif
.PHONY: $(BUILD) clean all .PHONY: $(BUILD) clean all
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all: $(BUILD) all: $(BUILD)
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.3ds @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.3ds
3dsx: $(BUILD) 3dsx: $(BUILD)
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.3ds 3dsx @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.3ds 3dsx
cia: $(BUILD) cia: $(BUILD)
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.3ds cia @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.3ds cia
$(BUILD): $(BUILD):
@[ -d $@ ] || mkdir -p $@ @[ -d $@ ] || mkdir -p $@
@ -149,7 +149,7 @@ $(BUILD):
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
clean: clean:
@echo clean ... @echo clean ...
@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf $(TARGET).cia output/ @$(RM) -r $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf $(TARGET).cia output/
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
@ -168,27 +168,23 @@ cia: $(OUTPUT).cia
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
.PHONY: all .PHONY: all
all : $(OUTPUT).3dsx $(OUTPUT).smdh all: $(OUTPUT).3dsx $(OUTPUT).smdh
$(OUTPUT).smdh : $(TOPDIR)/Makefile.3ds $(OUTPUT).smdh: $(TOPDIR)/Makefile.3ds
$(OUTPUT).3dsx: $(OUTPUT).smdh $(OUTPUT).3dsx: $(OUTPUT).smdh
endif endif
$(OUTPUT).3dsx: $(OUTPUT).elf $(OUTPUT).3dsx: $(OUTPUT).elf
$(OUTPUT).elf: $(OFILES) $(OUTPUT).elf: $(OFILES)
#$(OUTPUT).smdh : $(APP_ICON) $(OUTPUT).cia: $(OUTPUT).elf $(OUTPUT).smdh $(TARGET).bnr $(TOPDIR)/$(RSF_FILE)
# @bannertool makesmdh -s "$(APP_TITLE)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@ @makerom -f cia -target t -exefslogo -o $@ \
# @echo "built ... $(notdir $@)" -elf $(OUTPUT).elf -rsf $(TOPDIR)/$(RSF_FILE) \
-banner $(TARGET).bnr \
$(OUTPUT).cia : $(OUTPUT).elf $(OUTPUT).smdh $(TARGET).bnr $(TOPDIR)/$(RSF_FILE) -icon $(OUTPUT).smdh
@makerom -f cia -target t -exefslogo -o $@ \
-elf $(OUTPUT).elf -rsf $(TOPDIR)/$(RSF_FILE) \
-banner $(TARGET).bnr \
-icon $(OUTPUT).smdh
@echo "built ... $(notdir $@)" @echo "built ... $(notdir $@)"
$(TARGET).bnr : $(TOPDIR)/$(BNR_IMAGE) $(TOPDIR)/$(BNR_AUDIO) $(TARGET).bnr: $(TOPDIR)/$(BNR_IMAGE) $(TOPDIR)/$(BNR_AUDIO)
@bannertool makebanner -o $@ -i $(TOPDIR)/$(BNR_IMAGE) -a $(TOPDIR)/$(BNR_AUDIO) @bannertool makebanner -o $@ -i $(TOPDIR)/$(BNR_IMAGE) -a $(TOPDIR)/$(BNR_AUDIO)
@echo "built ... $@" @echo "built ... $@"
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------