From 531c3639aa6680d0bce51ac0a3cb0e19a60163d2 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Thu, 19 Apr 2018 00:25:04 +0100 Subject: [PATCH] add ROMFS option to all Makefiles --- account/Makefile | 6 ++++++ app_controldata/Makefile | 6 ++++++ audio/echo/Makefile | 6 ++++++ audio/playtone/Makefile | 6 ++++++ fs/save/Makefile | 6 ++++++ fs/sdmc/Makefile | 6 ++++++ graphics/printing/hello-world/Makefile | 6 ++++++ graphics/printing/vt52-demo/Makefile | 6 ++++++ graphics/simplegfx/Makefile | 6 ++++++ hid/irsensor/Makefile | 6 ++++++ hid/read-controls/Makefile | 6 ++++++ hid/touch-screen/Makefile | 6 ++++++ hid/vibration/Makefile | 6 ++++++ settings/get_system_language/Makefile | 6 ++++++ templates/application/Makefile | 6 ++++++ time/Makefile | 6 ++++++ usb/usbds/Makefile | 6 ++++++ 17 files changed, 102 insertions(+) diff --git a/account/Makefile b/account/Makefile index 62b45e7..0603dc8 100644 --- a/account/Makefile +++ b/account/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/app_controldata/Makefile b/app_controldata/Makefile index 62b45e7..0603dc8 100644 --- a/app_controldata/Makefile +++ b/app_controldata/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/audio/echo/Makefile b/audio/echo/Makefile index 71b6878..c24ded8 100644 --- a/audio/echo/Makefile +++ b/audio/echo/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/audio/playtone/Makefile b/audio/playtone/Makefile index 71b6878..c24ded8 100644 --- a/audio/playtone/Makefile +++ b/audio/playtone/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/fs/save/Makefile b/fs/save/Makefile index 62b45e7..0603dc8 100644 --- a/fs/save/Makefile +++ b/fs/save/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/fs/sdmc/Makefile b/fs/sdmc/Makefile index 62b45e7..0603dc8 100644 --- a/fs/sdmc/Makefile +++ b/fs/sdmc/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/graphics/printing/hello-world/Makefile b/graphics/printing/hello-world/Makefile index 62b45e7..0603dc8 100644 --- a/graphics/printing/hello-world/Makefile +++ b/graphics/printing/hello-world/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/graphics/printing/vt52-demo/Makefile b/graphics/printing/vt52-demo/Makefile index 62b45e7..0603dc8 100644 --- a/graphics/printing/vt52-demo/Makefile +++ b/graphics/printing/vt52-demo/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/graphics/simplegfx/Makefile b/graphics/simplegfx/Makefile index 62b45e7..0603dc8 100644 --- a/graphics/simplegfx/Makefile +++ b/graphics/simplegfx/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/hid/irsensor/Makefile b/hid/irsensor/Makefile index 62b45e7..0603dc8 100644 --- a/hid/irsensor/Makefile +++ b/hid/irsensor/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/hid/read-controls/Makefile b/hid/read-controls/Makefile index 62b45e7..0603dc8 100644 --- a/hid/read-controls/Makefile +++ b/hid/read-controls/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/hid/touch-screen/Makefile b/hid/touch-screen/Makefile index 62b45e7..0603dc8 100644 --- a/hid/touch-screen/Makefile +++ b/hid/touch-screen/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/hid/vibration/Makefile b/hid/vibration/Makefile index 62b45e7..0603dc8 100644 --- a/hid/vibration/Makefile +++ b/hid/vibration/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/settings/get_system_language/Makefile b/settings/get_system_language/Makefile index 62b45e7..0603dc8 100644 --- a/settings/get_system_language/Makefile +++ b/settings/get_system_language/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/templates/application/Makefile b/templates/application/Makefile index 62b45e7..0603dc8 100644 --- a/templates/application/Makefile +++ b/templates/application/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/time/Makefile b/time/Makefile index 62b45e7..0603dc8 100644 --- a/time/Makefile +++ b/time/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- diff --git a/usb/usbds/Makefile b/usb/usbds/Makefile index 62b45e7..0603dc8 100644 --- a/usb/usbds/Makefile +++ b/usb/usbds/Makefile @@ -16,6 +16,7 @@ include $(DEVKITPRO)/libnx/switch_rules # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) # # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. @@ -35,6 +36,7 @@ SOURCES := source DATA := data INCLUDES := include EXEFS_SRC := exefs_src +#ROMFS := romfs #--------------------------------------------------------------------------------- # options for code generation @@ -130,6 +132,10 @@ ifneq ($(APP_TITLEID),) export NACPFLAGS += --titleid=$(APP_TITLEID) endif +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + .PHONY: $(BUILD) clean all #---------------------------------------------------------------------------------