From 7ed122eefcf3d7f430351642a13e1f7cc58e395f Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Fri, 26 Jan 2018 23:43:41 +0000 Subject: [PATCH] move switch specs, linkscript & rules to libnx --- buildscripts/lib/switch.specs | 8 -------- nx/Makefile | 4 ++-- {buildscripts/lib => nx}/switch.ld | 0 nx/switch.specs | 8 ++++++++ {buildscripts => nx}/switch_rules | 0 5 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 buildscripts/lib/switch.specs rename {buildscripts/lib => nx}/switch.ld (100%) create mode 100644 nx/switch.specs rename {buildscripts => nx}/switch_rules (100%) diff --git a/buildscripts/lib/switch.specs b/buildscripts/lib/switch.specs deleted file mode 100644 index 914f97a0..00000000 --- a/buildscripts/lib/switch.specs +++ /dev/null @@ -1,8 +0,0 @@ -%rename link old_link - -*link: -%(old_link) -T switch.ld%s -pie --gc-sections -z text -z nodynamic-undefined-weak - -*startfile: -crti%O%s crtbegin%O%s - diff --git a/nx/Makefile b/nx/Makefile index 5e49174b..91d8ca49 100644 --- a/nx/Makefile +++ b/nx/Makefile @@ -94,10 +94,10 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ all: lib/libnx.a lib/libnxd.a dist-bin: all - @tar --exclude=*~ -cjf libnx-$(VERSION).tar.bz2 include lib default_icon.jpg + @tar --exclude=*~ -cjf libnx-$(VERSION).tar.bz2 include lib default_icon.jpg switch_rules switch.ld switch.specs dist-src: - @tar --exclude=*~ -cjf libnx-src-$(VERSION).tar.bz2 include source data Makefile # Doxyfile Doxyfile.internal + @tar --exclude=*~ -cjf libnx-src-$(VERSION).tar.bz2 include source data Makefile switch_rules switch.ld switch.specs dist: dist-src dist-bin diff --git a/buildscripts/lib/switch.ld b/nx/switch.ld similarity index 100% rename from buildscripts/lib/switch.ld rename to nx/switch.ld diff --git a/nx/switch.specs b/nx/switch.specs new file mode 100644 index 00000000..7a0b9957 --- /dev/null +++ b/nx/switch.specs @@ -0,0 +1,8 @@ +%rename link old_link + +*link: +%(old_link) -T %:getenv(DEVKITPRO /libnx/switch.ld) -pie --gc-sections -z text -z nodynamic-undefined-weak + +*startfile: +crti%O%s crtbegin%O%s + diff --git a/buildscripts/switch_rules b/nx/switch_rules similarity index 100% rename from buildscripts/switch_rules rename to nx/switch_rules