Fixed Makefiles for the icon/nacp blocks.

This commit is contained in:
yellows8 2018-01-01 20:52:14 -05:00
parent 67b4b8aad4
commit 45cb8abbf5
4 changed files with 52 additions and 52 deletions

View File

@ -106,33 +106,33 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC)
.PHONY: $(BUILD) clean all
ifeq ($(strip $(ICON)),) ifeq ($(strip $(ICON)),)
icons := $(wildcard *.jpg) icons := $(wildcard *.jpg)
ifneq (,$(findstring $(TARGET).jpg,$(icons))) ifneq (,$(findstring $(TARGET).jpg,$(icons)))
export APP_ICON := $(TOPDIR)/$(TARGET).jpg export APP_ICON := $(TOPDIR)/$(TARGET).jpg
else else
ifneq (,$(findstring icon.jpg,$(icons))) ifneq (,$(findstring icon.jpg,$(icons)))
export APP_ICON := $(TOPDIR)/icon.jpg export APP_ICON := $(TOPDIR)/icon.jpg
endif endif
endif endif
else else
export APP_ICON := $(TOPDIR)/$(ICON) export APP_ICON := $(TOPDIR)/$(ICON)
endif endif
ifeq ($(strip $(NO_ICON)),) ifeq ($(strip $(NO_ICON)),)
export NROFLAGS += --icon=$(APP_ICON) export NROFLAGS += --icon=$(APP_ICON)
endif endif
ifeq ($(strip $(NO_NACP)),) ifeq ($(strip $(NO_NACP)),)
export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
endif endif
ifneq ($(APP_TITLEID),) ifneq ($(APP_TITLEID),)
export NACPFLAGS += --titleid=$(APP_TITLEID) export NACPFLAGS += --titleid=$(APP_TITLEID)
endif endif
.PHONY: $(BUILD) clean all
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all: $(BUILD) all: $(BUILD)

View File

@ -106,33 +106,33 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC)
.PHONY: $(BUILD) clean all
ifeq ($(strip $(ICON)),) ifeq ($(strip $(ICON)),)
icons := $(wildcard *.jpg) icons := $(wildcard *.jpg)
ifneq (,$(findstring $(TARGET).jpg,$(icons))) ifneq (,$(findstring $(TARGET).jpg,$(icons)))
export APP_ICON := $(TOPDIR)/$(TARGET).jpg export APP_ICON := $(TOPDIR)/$(TARGET).jpg
else else
ifneq (,$(findstring icon.jpg,$(icons))) ifneq (,$(findstring icon.jpg,$(icons)))
export APP_ICON := $(TOPDIR)/icon.jpg export APP_ICON := $(TOPDIR)/icon.jpg
endif endif
endif endif
else else
export APP_ICON := $(TOPDIR)/$(ICON) export APP_ICON := $(TOPDIR)/$(ICON)
endif endif
ifeq ($(strip $(NO_ICON)),) ifeq ($(strip $(NO_ICON)),)
export NROFLAGS += --icon=$(APP_ICON) export NROFLAGS += --icon=$(APP_ICON)
endif endif
ifeq ($(strip $(NO_NACP)),) ifeq ($(strip $(NO_NACP)),)
export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
endif endif
ifneq ($(APP_TITLEID),) ifneq ($(APP_TITLEID),)
export NACPFLAGS += --titleid=$(APP_TITLEID) export NACPFLAGS += --titleid=$(APP_TITLEID)
endif endif
.PHONY: $(BUILD) clean all
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all: $(BUILD) all: $(BUILD)

View File

@ -106,33 +106,33 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC)
.PHONY: $(BUILD) clean all
ifeq ($(strip $(ICON)),) ifeq ($(strip $(ICON)),)
icons := $(wildcard *.jpg) icons := $(wildcard *.jpg)
ifneq (,$(findstring $(TARGET).jpg,$(icons))) ifneq (,$(findstring $(TARGET).jpg,$(icons)))
export APP_ICON := $(TOPDIR)/$(TARGET).jpg export APP_ICON := $(TOPDIR)/$(TARGET).jpg
else else
ifneq (,$(findstring icon.jpg,$(icons))) ifneq (,$(findstring icon.jpg,$(icons)))
export APP_ICON := $(TOPDIR)/icon.jpg export APP_ICON := $(TOPDIR)/icon.jpg
endif endif
endif endif
else else
export APP_ICON := $(TOPDIR)/$(ICON) export APP_ICON := $(TOPDIR)/$(ICON)
endif endif
ifeq ($(strip $(NO_ICON)),) ifeq ($(strip $(NO_ICON)),)
export NROFLAGS += --icon=$(APP_ICON) export NROFLAGS += --icon=$(APP_ICON)
endif endif
ifeq ($(strip $(NO_NACP)),) ifeq ($(strip $(NO_NACP)),)
export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
endif endif
ifneq ($(APP_TITLEID),) ifneq ($(APP_TITLEID),)
export NACPFLAGS += --titleid=$(APP_TITLEID) export NACPFLAGS += --titleid=$(APP_TITLEID)
endif endif
.PHONY: $(BUILD) clean all
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all: $(BUILD) all: $(BUILD)

View File

@ -106,33 +106,33 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC)
.PHONY: $(BUILD) clean all
ifeq ($(strip $(ICON)),) ifeq ($(strip $(ICON)),)
icons := $(wildcard *.jpg) icons := $(wildcard *.jpg)
ifneq (,$(findstring $(TARGET).jpg,$(icons))) ifneq (,$(findstring $(TARGET).jpg,$(icons)))
export APP_ICON := $(TOPDIR)/$(TARGET).jpg export APP_ICON := $(TOPDIR)/$(TARGET).jpg
else else
ifneq (,$(findstring icon.jpg,$(icons))) ifneq (,$(findstring icon.jpg,$(icons)))
export APP_ICON := $(TOPDIR)/icon.jpg export APP_ICON := $(TOPDIR)/icon.jpg
endif endif
endif endif
else else
export APP_ICON := $(TOPDIR)/$(ICON) export APP_ICON := $(TOPDIR)/$(ICON)
endif endif
ifeq ($(strip $(NO_ICON)),) ifeq ($(strip $(NO_ICON)),)
export NROFLAGS += --icon=$(APP_ICON) export NROFLAGS += --icon=$(APP_ICON)
endif endif
ifeq ($(strip $(NO_NACP)),) ifeq ($(strip $(NO_NACP)),)
export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
endif endif
ifneq ($(APP_TITLEID),) ifneq ($(APP_TITLEID),)
export NACPFLAGS += --titleid=$(APP_TITLEID) export NACPFLAGS += --titleid=$(APP_TITLEID)
endif endif
.PHONY: $(BUILD) clean all
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all: $(BUILD) all: $(BUILD)