Skip to content

Commit

Permalink
Add release target and fix minor bug
Browse files Browse the repository at this point in the history
  • Loading branch information
mtheall committed Sep 15, 2019
1 parent a910da0 commit 00c2c44
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
15 changes: 8 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)),)
Expand All @@ -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 >ftpd.3dsx.xz
@xz -c <ftpd.cia >ftpd.cia.xz
@xz -c <ftpd.nro >ftpd.nro.xz

nro:
@$(MAKE) -f Makefile.switch all

Expand 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
4 changes: 3 additions & 1 deletion source/console.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 00c2c44

Please sign in to comment.