From 816c3bfa39de9d92d7d1a7916932f0939c99ab37 Mon Sep 17 00:00:00 2001 From: Michael Theall Date: Mon, 6 Apr 2020 22:41:48 -0500 Subject: [PATCH] v3.0.0-rc2 --- Makefile | 2 +- Makefile.3ds | 1 + README.md | 16 ++++++++-------- ftpd_qr.png | Bin 3451 -> 621 bytes 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 9b4213f..aafc568 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ export GITREV := $(shell git rev-parse HEAD 2>/dev/null | cut -c1-8) export VERSION_MAJOR := 3 export VERSION_MINOR := 0 export VERSION_MICRO := 0 -export VERSION := $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)-rc1 +export VERSION := $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)-rc2 ifneq ($(strip $(GITREV)),) export VERSION := $(VERSION)-$(GITREV) diff --git a/Makefile.3ds b/Makefile.3ds index 179a4b7..9110e30 100644 --- a/Makefile.3ds +++ b/Makefile.3ds @@ -287,6 +287,7 @@ $(OUTPUT).cia: $(OUTPUT).elf $(OUTPUT).smdh $(TARGET).bnr $(TOPDIR)/$(RSF_FILE) @echo "built ... $(notdir $@)" $(TARGET).bnr: $(TOPDIR)/$(BNR_IMAGE) $(TOPDIR)/$(BNR_AUDIO) + @[ -d $(dir $@) ] || mkdir -p $(dir $@) @bannertool makebanner -o $@ -i $(TOPDIR)/$(BNR_IMAGE) -a $(TOPDIR)/$(BNR_AUDIO) @echo "built ... $@" diff --git a/README.md b/README.md index 8c11397..083aa7f 100644 --- a/README.md +++ b/README.md @@ -10,15 +10,15 @@ FTP Server for 3DS/Switch/Linux. ## Latest Builds -CIA: https://mtheall.com/~mtheall/ftpd-3ds.cia +CIA: https://mtheall.com/~mtheall/ftpd.cia -3DSX: https://mtheall.com/~mtheall/ftpd-3ds.3dsx +3DSX: https://mtheall.com/~mtheall/ftpd.3dsx -NRO: https://mtheall.com/~mtheall/ftpd-nx.nro +NRO: https://mtheall.com/~mtheall/ftpd.nro CIA QR Code -![ftpd-3ds.cia](https://github.com/mtheall/ftpd/raw/master/ftpd_qr.png) +![ftpd.cia](https://github.com/mtheall/ftpd/raw/master/ftpd_qr.png) ## Build and install @@ -26,7 +26,7 @@ You must set up the [development environment](https://devkitpro.org/wiki/Getting ### 3DSX -The following pacman packages are required to build `ftpd-3ds.3dsx`: +The following pacman packages are required to build `3ds/ftpd.3dsx`: 3dstools devkitARM @@ -34,13 +34,13 @@ The following pacman packages are required to build `ftpd-3ds.3dsx`: They are available as part of the `3ds-dev` meta-package. -Build `ftpd-3ds.3dsx`: +Build `3ds/ftpd.3dsx`: make 3dsx ### NRO -The following pacman packages are required to build `ftpd-nx.nro`: +The following pacman packages are required to build `switch/ftpd.nro`: devkitA64 libnx @@ -48,7 +48,7 @@ The following pacman packages are required to build `ftpd-nx.nro`: They are available as part of the `switch-dev` meta-package. -Build `ftpd-nx.nro`: +Build `switch/ftpd.nro`: make nro diff --git a/ftpd_qr.png b/ftpd_qr.png index a15c750004baf6f22b6e307dfde46dff989e35bd..9d04fbb4d091ec7abca2cd136902a1b6d9b1d291 100644 GIT binary patch literal 621 zcmV-z0+RiSP)|Nf&uC5B8!tvi=`(|XTtJ4P8gjAQHweg8gfw|OX_a|D#i!&40jWVO zZ#9$WgTxw@^nyMt6+l2LkO(K;u^gRtc}wznKL-d%3-TsxfF&7if9?eWQjd5h+thwU z%H(psr<~p(AZ^G@HkNjYdg#pvU8@#L1rU(m5=zPDuRPNhb<5P+r?ljFJqH14K}eD| zW$+M5o7R@L%abxXMoSQo2E+?QdiP!3QX(%nK|mUil%GEDvwho5-mQLlp7%jOsu3Mi zSMsTS;;37$=gmj`2@sG5WcE`T+I6$BG#}OQM$dT=kX9s;)oVd)8T@A62LY*1SX-@L zNw(ieWb?hpBRzZt0ck=~e%@m9kzZ;`s}-DvBKbi;Y7@KbF_z~oHDay0gMj>rP?RWr zV5G8Ylt)V)S3yAPlc(_GKpcgk#YRo1ARsNs>nSy({=m^+edNwexfKMYDzQIePrN7) z-7+oq#6dtBkn$gMiUN_w(x1{C1mp^0343P`$~%)Q2*@Rbqd>&lGv(7R4+uytVwpSI z7&?{*+Y;sUoCyS^6^Zanj>AH%n~$2wOYv|JklF-+_;>LQ2aQe;Q^u5Z00000NkvXX Hu0mjfw=WLz literal 3451 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 MQJie+$j1}@3mUvHhyVZp