diff --git a/.gitignore b/.gitignore index b5d70e0..9b4e0d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,13 @@ -build/* -build.* -output/ -ftpd *.3dsx +*.3dsx.xz *.cia -*.smdh +*.cia.xz *.elf -*.nso -*.pfs0 *.nacp *.nro +*.nro.xz +*.nso +*.pfs0 +*.smdh +build.*/ +ftpd diff --git a/Makefile b/Makefile index be0af11..3f76a8b 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ export GITREV := $(shell git rev-parse HEAD 2>/dev/null | cut -c1-8) export VERSION_MAJOR := 2 export VERSION_MINOR := 3 -export VERSION_MICRO := 0 +export VERSION_MICRO := 1 export VERSION := $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO) ifneq ($(strip $(GITREV)),) @@ -13,6 +13,16 @@ endif all: @echo please choose 3dsx, cia, linux, or nro +release: + # can't let these three run in parallel with each other due to using same + # ftpd.elf file name + @$(MAKE) -f Makefile.switch all + @$(MAKE) -f Makefile.3ds 3dsx + @$(MAKE) -f Makefile.3ds cia + @xz -c ftpd.3dsx.xz + @xz -c ftpd.cia.xz + @xz -c ftpd.nro.xz + nro: @$(MAKE) -f Makefile.switch all @@ -29,3 +39,4 @@ clean: @$(MAKE) -f Makefile.switch clean @$(MAKE) -f Makefile.3ds clean @$(MAKE) -f Makefile.linux clean + @$(RM) ftpd.3dsx.xz ftpd.cia.xz ftpd.nro.xz diff --git a/source/console.c b/source/console.c index 8591a86..478beb1 100644 --- a/source/console.c +++ b/source/console.c @@ -16,13 +16,15 @@ #define CONSOLE_HEIGHT 45 #endif +#if defined(_3DS) || defined (__SWITCH__) static PrintConsole status_console; static PrintConsole main_console; +#endif + #if ENABLE_LOGGING static bool disable_logging = false; #endif - #if defined(_3DS) static PrintConsole tcp_console;