From 45cb8abbf56509890cfde0150f028e466f090082 Mon Sep 17 00:00:00 2001 From: yellows8 Date: Mon, 1 Jan 2018 20:52:14 -0500 Subject: [PATCH] Fixed Makefiles for the icon/nacp blocks. --- graphics/printing/hello-world/Makefile | 26 +++++++++++++------------- graphics/simplegfx/Makefile | 26 +++++++++++++------------- templates/simple/Makefile | 26 +++++++++++++------------- usb/usbds/Makefile | 26 +++++++++++++------------- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/graphics/printing/hello-world/Makefile b/graphics/printing/hello-world/Makefile index 77a71db..e6aeee7 100644 --- a/graphics/printing/hello-world/Makefile +++ b/graphics/printing/hello-world/Makefile @@ -106,33 +106,33 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) -.PHONY: $(BUILD) clean all - ifeq ($(strip $(ICON)),) -icons := $(wildcard *.jpg) -ifneq (,$(findstring $(TARGET).jpg,$(icons))) - export APP_ICON := $(TOPDIR)/$(TARGET).jpg -else - ifneq (,$(findstring icon.jpg,$(icons))) - export APP_ICON := $(TOPDIR)/icon.jpg + icons := $(wildcard *.jpg) + ifneq (,$(findstring $(TARGET).jpg,$(icons))) + export APP_ICON := $(TOPDIR)/$(TARGET).jpg + else + ifneq (,$(findstring icon.jpg,$(icons))) + export APP_ICON := $(TOPDIR)/icon.jpg + endif endif -endif else -export APP_ICON := $(TOPDIR)/$(ICON) + export APP_ICON := $(TOPDIR)/$(ICON) endif ifeq ($(strip $(NO_ICON)),) -export NROFLAGS += --icon=$(APP_ICON) + export NROFLAGS += --icon=$(APP_ICON) endif ifeq ($(strip $(NO_NACP)),) -export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp + export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp endif ifneq ($(APP_TITLEID),) -export NACPFLAGS += --titleid=$(APP_TITLEID) + export NACPFLAGS += --titleid=$(APP_TITLEID) endif +.PHONY: $(BUILD) clean all + #--------------------------------------------------------------------------------- all: $(BUILD) diff --git a/graphics/simplegfx/Makefile b/graphics/simplegfx/Makefile index 77a71db..e6aeee7 100644 --- a/graphics/simplegfx/Makefile +++ b/graphics/simplegfx/Makefile @@ -106,33 +106,33 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) -.PHONY: $(BUILD) clean all - ifeq ($(strip $(ICON)),) -icons := $(wildcard *.jpg) -ifneq (,$(findstring $(TARGET).jpg,$(icons))) - export APP_ICON := $(TOPDIR)/$(TARGET).jpg -else - ifneq (,$(findstring icon.jpg,$(icons))) - export APP_ICON := $(TOPDIR)/icon.jpg + icons := $(wildcard *.jpg) + ifneq (,$(findstring $(TARGET).jpg,$(icons))) + export APP_ICON := $(TOPDIR)/$(TARGET).jpg + else + ifneq (,$(findstring icon.jpg,$(icons))) + export APP_ICON := $(TOPDIR)/icon.jpg + endif endif -endif else -export APP_ICON := $(TOPDIR)/$(ICON) + export APP_ICON := $(TOPDIR)/$(ICON) endif ifeq ($(strip $(NO_ICON)),) -export NROFLAGS += --icon=$(APP_ICON) + export NROFLAGS += --icon=$(APP_ICON) endif ifeq ($(strip $(NO_NACP)),) -export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp + export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp endif ifneq ($(APP_TITLEID),) -export NACPFLAGS += --titleid=$(APP_TITLEID) + export NACPFLAGS += --titleid=$(APP_TITLEID) endif +.PHONY: $(BUILD) clean all + #--------------------------------------------------------------------------------- all: $(BUILD) diff --git a/templates/simple/Makefile b/templates/simple/Makefile index 77a71db..e6aeee7 100644 --- a/templates/simple/Makefile +++ b/templates/simple/Makefile @@ -106,33 +106,33 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) -.PHONY: $(BUILD) clean all - ifeq ($(strip $(ICON)),) -icons := $(wildcard *.jpg) -ifneq (,$(findstring $(TARGET).jpg,$(icons))) - export APP_ICON := $(TOPDIR)/$(TARGET).jpg -else - ifneq (,$(findstring icon.jpg,$(icons))) - export APP_ICON := $(TOPDIR)/icon.jpg + icons := $(wildcard *.jpg) + ifneq (,$(findstring $(TARGET).jpg,$(icons))) + export APP_ICON := $(TOPDIR)/$(TARGET).jpg + else + ifneq (,$(findstring icon.jpg,$(icons))) + export APP_ICON := $(TOPDIR)/icon.jpg + endif endif -endif else -export APP_ICON := $(TOPDIR)/$(ICON) + export APP_ICON := $(TOPDIR)/$(ICON) endif ifeq ($(strip $(NO_ICON)),) -export NROFLAGS += --icon=$(APP_ICON) + export NROFLAGS += --icon=$(APP_ICON) endif ifeq ($(strip $(NO_NACP)),) -export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp + export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp endif ifneq ($(APP_TITLEID),) -export NACPFLAGS += --titleid=$(APP_TITLEID) + export NACPFLAGS += --titleid=$(APP_TITLEID) endif +.PHONY: $(BUILD) clean all + #--------------------------------------------------------------------------------- all: $(BUILD) diff --git a/usb/usbds/Makefile b/usb/usbds/Makefile index 77a71db..e6aeee7 100644 --- a/usb/usbds/Makefile +++ b/usb/usbds/Makefile @@ -106,33 +106,33 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) -.PHONY: $(BUILD) clean all - ifeq ($(strip $(ICON)),) -icons := $(wildcard *.jpg) -ifneq (,$(findstring $(TARGET).jpg,$(icons))) - export APP_ICON := $(TOPDIR)/$(TARGET).jpg -else - ifneq (,$(findstring icon.jpg,$(icons))) - export APP_ICON := $(TOPDIR)/icon.jpg + icons := $(wildcard *.jpg) + ifneq (,$(findstring $(TARGET).jpg,$(icons))) + export APP_ICON := $(TOPDIR)/$(TARGET).jpg + else + ifneq (,$(findstring icon.jpg,$(icons))) + export APP_ICON := $(TOPDIR)/icon.jpg + endif endif -endif else -export APP_ICON := $(TOPDIR)/$(ICON) + export APP_ICON := $(TOPDIR)/$(ICON) endif ifeq ($(strip $(NO_ICON)),) -export NROFLAGS += --icon=$(APP_ICON) + export NROFLAGS += --icon=$(APP_ICON) endif ifeq ($(strip $(NO_NACP)),) -export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp + export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp endif ifneq ($(APP_TITLEID),) -export NACPFLAGS += --titleid=$(APP_TITLEID) + export NACPFLAGS += --titleid=$(APP_TITLEID) endif +.PHONY: $(BUILD) clean all + #--------------------------------------------------------------------------------- all: $(BUILD)