From 03144eba8ad8273e359250b5a9d764a023ca6c28 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Sun, 28 Jan 2018 01:40:50 +0000 Subject: [PATCH] update build system --- graphics/printing/hello-world/Makefile | 10 +++++----- graphics/simplegfx/Makefile | 10 +++++----- templates/simple/Makefile | 8 ++++---- usb/usbds/Makefile | 10 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/graphics/printing/hello-world/Makefile b/graphics/printing/hello-world/Makefile index e6aeee7..76315fc 100644 --- a/graphics/printing/hello-world/Makefile +++ b/graphics/printing/hello-world/Makefile @@ -2,12 +2,12 @@ .SUFFIXES: #--------------------------------------------------------------------------------- -ifeq ($(strip $(DEVKITA64)),) -$(error "Please set DEVKITA64 in your environment. export DEVKITA64=DEVKITA64") +ifeq ($(strip $(DEVKITPRO)),) +$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") endif TOPDIR ?= $(CURDIR) -include $(DEVKITA64)/switch_rules +include $(DEVKITPRO)/libnx/switch_rules #--------------------------------------------------------------------------------- # TARGET is the name of the output @@ -16,7 +16,7 @@ include $(DEVKITA64)/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". -# +# # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. # APP_TITLE is the name of the app stored in the .nacp file (Optional) @@ -50,7 +50,7 @@ CFLAGS += $(INCLUDE) -DSWITCH CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 ASFLAGS := -g $(ARCH) -LDFLAGS = -specs=switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) +LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) LIBS := -lnx diff --git a/graphics/simplegfx/Makefile b/graphics/simplegfx/Makefile index e6aeee7..76315fc 100644 --- a/graphics/simplegfx/Makefile +++ b/graphics/simplegfx/Makefile @@ -2,12 +2,12 @@ .SUFFIXES: #--------------------------------------------------------------------------------- -ifeq ($(strip $(DEVKITA64)),) -$(error "Please set DEVKITA64 in your environment. export DEVKITA64=DEVKITA64") +ifeq ($(strip $(DEVKITPRO)),) +$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") endif TOPDIR ?= $(CURDIR) -include $(DEVKITA64)/switch_rules +include $(DEVKITPRO)/libnx/switch_rules #--------------------------------------------------------------------------------- # TARGET is the name of the output @@ -16,7 +16,7 @@ include $(DEVKITA64)/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". -# +# # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. # APP_TITLE is the name of the app stored in the .nacp file (Optional) @@ -50,7 +50,7 @@ CFLAGS += $(INCLUDE) -DSWITCH CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 ASFLAGS := -g $(ARCH) -LDFLAGS = -specs=switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) +LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) LIBS := -lnx diff --git a/templates/simple/Makefile b/templates/simple/Makefile index e6aeee7..5ab3ea9 100644 --- a/templates/simple/Makefile +++ b/templates/simple/Makefile @@ -2,12 +2,12 @@ .SUFFIXES: #--------------------------------------------------------------------------------- -ifeq ($(strip $(DEVKITA64)),) -$(error "Please set DEVKITA64 in your environment. export DEVKITA64=DEVKITA64") +ifeq ($(strip $(DEVKITPRO)),) +$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") endif TOPDIR ?= $(CURDIR) -include $(DEVKITA64)/switch_rules +include $(DEVKITPRO)/libnx/switch_rules #--------------------------------------------------------------------------------- # TARGET is the name of the output @@ -50,7 +50,7 @@ CFLAGS += $(INCLUDE) -DSWITCH CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 ASFLAGS := -g $(ARCH) -LDFLAGS = -specs=switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) +LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) LIBS := -lnx diff --git a/usb/usbds/Makefile b/usb/usbds/Makefile index e6aeee7..76315fc 100644 --- a/usb/usbds/Makefile +++ b/usb/usbds/Makefile @@ -2,12 +2,12 @@ .SUFFIXES: #--------------------------------------------------------------------------------- -ifeq ($(strip $(DEVKITA64)),) -$(error "Please set DEVKITA64 in your environment. export DEVKITA64=DEVKITA64") +ifeq ($(strip $(DEVKITPRO)),) +$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") endif TOPDIR ?= $(CURDIR) -include $(DEVKITA64)/switch_rules +include $(DEVKITPRO)/libnx/switch_rules #--------------------------------------------------------------------------------- # TARGET is the name of the output @@ -16,7 +16,7 @@ include $(DEVKITA64)/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". -# +# # NO_ICON: if set to anything, do not use icon. # NO_NACP: if set to anything, no .nacp file is generated. # APP_TITLE is the name of the app stored in the .nacp file (Optional) @@ -50,7 +50,7 @@ CFLAGS += $(INCLUDE) -DSWITCH CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 ASFLAGS := -g $(ARCH) -LDFLAGS = -specs=switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) +LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) LIBS := -lnx