The-Homebrew-Cloud/ftpiiu_plugin
2
0
Fork 0
mirror of https://github.com/wiiu-env/ftpiiu_plugin.git synced 2024-12-23 03:11:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add release target and fix minor bug

Browse Source
This commit is contained in:
Michael Theall 2019-09-15 15:34:35 -05:00
parent a910da0799
commit 00c2c44271
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitignore vendored
View File

@ -1,12 +1,13 @@
build/*
build.*
output/
ftpd
*.3dsx *.3dsx
*.3dsx.xz
*.cia *.cia
*.smdh *.cia.xz
*.elf *.elf
*.nso
*.pfs0
*.nacp *.nacp
*.nro *.nro
*.nro.xz
*.nso
*.pfs0
*.smdh
build.*/
ftpd

13
Makefile
View File

@ -3,7 +3,7 @@
export GITREV := $(shell git rev-parse HEAD 2>/dev/null | cut -c1-8) export GITREV := $(shell git rev-parse HEAD 2>/dev/null | cut -c1-8)
export VERSION_MAJOR := 2 export VERSION_MAJOR := 2
export VERSION_MINOR := 3 export VERSION_MINOR := 3
export VERSION_MICRO := 0 export VERSION_MICRO := 1
export VERSION := $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO) export VERSION := $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)
ifneq ($(strip $(GITREV)),) ifneq ($(strip $(GITREV)),)
@ -13,6 +13,16 @@ endif
all: all:
@echo please choose 3dsx, cia, linux, or nro @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: nro:
@$(MAKE) -f Makefile.switch all @$(MAKE) -f Makefile.switch all
@ -29,3 +39,4 @@ clean:
@$(MAKE) -f Makefile.switch clean @$(MAKE) -f Makefile.switch clean
@$(MAKE) -f Makefile.3ds clean @$(MAKE) -f Makefile.3ds clean
@$(MAKE) -f Makefile.linux clean @$(MAKE) -f Makefile.linux clean
@$(RM) ftpd.3dsx.xz ftpd.cia.xz ftpd.nro.xz

4
source/console.c
View File

@ -16,13 +16,15 @@
#define CONSOLE_HEIGHT 45 #define CONSOLE_HEIGHT 45
#endif #endif
#if defined(_3DS) || defined (__SWITCH__)
static PrintConsole status_console; static PrintConsole status_console;
static PrintConsole main_console; static PrintConsole main_console;
#endif
#if ENABLE_LOGGING #if ENABLE_LOGGING
static bool disable_logging = false; static bool disable_logging = false;
#endif #endif
#if defined(_3DS) #if defined(_3DS)
static PrintConsole tcp_console; static PrintConsole tcp_console;