MirrorBackup/GodMode9
1
0
Fork 0
forked from Mirror/GodMode9
Code Pull Requests Activity

Pull version numbers from git

Browse Source
This commit is contained in:
d0k3 2017-08-16 15:50:46 +02:00
parent 0fb149afa4
commit 4faf67e194
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -37,6 +37,9 @@ CFLAGS := $(ARCH) -g -Wall -Wextra -Wpedantic -Wcast-align -Wno-main -O2 \
CFLAGS += -DBUILD_NAME="\"$(TARGET) (`date +'%Y/%m/%d'`)\"" CFLAGS += -DBUILD_NAME="\"$(TARGET) (`date +'%Y/%m/%d'`)\""
VERSION := $(shell git describe --tags --abbrev=8)
CFLAGS += -DVERSION="\"$(VERSION)\""
ifeq ($(FONT),ORIG) ifeq ($(FONT),ORIG)
CFLAGS += -DFONT_ORIGINAL CFLAGS += -DFONT_ORIGINAL
else ifeq ($(FONT),6X10) else ifeq ($(FONT),6X10)

3
source/common/common.h
View File

@ -39,9 +39,6 @@
#define QLZ_SPLASH sm9_splash_baby_qlz #define QLZ_SPLASH sm9_splash_baby_qlz
#endif #endif
// GodMode9 version
#define VERSION "1.3.3"
// input / output paths // input / output paths
#define SUPPORT_PATHS "0:/gm9/support", "0:", "0:/files9" // legacy paths #define SUPPORT_PATHS "0:/gm9/support", "0:", "0:/files9" // legacy paths
#define SCRIPT_PATH "0:/gm9/scripts" #define SCRIPT_PATH "0:/gm9/scripts"

7
source/godmode.c
View File

@ -170,7 +170,7 @@ void DrawUserInterface(const char* curr_path, DirEntry* curr_entry, DirStruct* c
if (*curr_path) { if (*curr_path) {
char bytestr0[32]; char bytestr0[32];
char bytestr1[32]; char bytestr1[32];
// DrawStringF(TOP_SCREEN, bartxt_rx, bartxt_start, COLOR_STD_BG, COLOR_TOP_BAR, "%19.19s", "LOADING..."); DrawStringF(TOP_SCREEN, bartxt_rx, bartxt_start, COLOR_STD_BG, COLOR_TOP_BAR, "%19.19s", "LOADING...");
FormatBytes(bytestr0, GetFreeSpace(curr_path)); FormatBytes(bytestr0, GetFreeSpace(curr_path));
FormatBytes(bytestr1, GetTotalSpace(curr_path)); FormatBytes(bytestr1, GetTotalSpace(curr_path));
snprintf(tempstr, 64, "%s/%s", bytestr0, bytestr1); snprintf(tempstr, 64, "%s/%s", bytestr0, bytestr1);
@ -243,7 +243,7 @@ void DrawUserInterface(const char* curr_path, DirEntry* curr_entry, DirStruct* c
// bottom: inctruction block // bottom: inctruction block
char instr[512]; char instr[512];
snprintf(instr, 512, "%s\n%s%s%s%s%s%s%s%s", snprintf(instr, 512, "%s\n%s%s%s%s%s%s%s%s",
FLAVOR " Explorer v"VERSION, // generic start part FLAVOR " " VERSION, // generic start part
(*curr_path) ? ((clipboard->n_entries == 0) ? "L - MARK files (use with \x18\x19\x1A\x1B)\nX - DELETE / [+R] RENAME file(s)\nY - COPY files / [+R] CREATE entry\n" : (*curr_path) ? ((clipboard->n_entries == 0) ? "L - MARK files (use with \x18\x19\x1A\x1B)\nX - DELETE / [+R] RENAME file(s)\nY - COPY files / [+R] CREATE entry\n" :
"L - MARK files (use with \x18\x19\x1A\x1B)\nX - DELETE / [+R] RENAME file(s)\nY - PASTE files / [+R] CREATE entry\n") : "L - MARK files (use with \x18\x19\x1A\x1B)\nX - DELETE / [+R] RENAME file(s)\nY - PASTE files / [+R] CREATE entry\n") :
((GetWritePermissions() > PERM_BASE) ? "R+Y - Relock write permissions\n" : ""), ((GetWritePermissions() > PERM_BASE) ? "R+Y - Relock write permissions\n" : ""),
@ -1588,7 +1588,7 @@ u32 HomeMoreMenu(char* current_path, DirStruct* current_dir, DirStruct* clipboar
} }
u32 SplashInit() { u32 SplashInit() {
const char* namestr = FLAVOR " Explorer v" VERSION; const char* namestr = FLAVOR " " VERSION;
const char* loadstr = "loading..."; const char* loadstr = "loading...";
const u32 pos_xb = 10; const u32 pos_xb = 10;
const u32 pos_yb = 10; const u32 pos_yb = 10;
@ -1655,6 +1655,7 @@ u32 GodMode() {
} }
} }
while (CheckButton(BUTTON_A)); // don't continue while A is held
while (timer_msec( timer ) < 500); // show splash for at least 0.5 sec while (timer_msec( timer ) < 500); // show splash for at least 0.5 sec
ClearScreenF(true, true, COLOR_STD_BG); // clear splash ClearScreenF(true, true, COLOR_STD_BG); // clear splash