Show app's version number

This commit is contained in:
RocketRobz 2019-12-21 23:56:46 -07:00
parent 973e4bbf07
commit 2592b859bf
4 changed files with 12 additions and 6 deletions

View File

@ -27,7 +27,7 @@ endif
# Version number # Version number
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
VERSION_MAJOR := 1 VERSION_MAJOR := 2
VERSION_MINOR := 0 VERSION_MINOR := 0
VERSION_MICRO := 0 VERSION_MICRO := 0
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
@ -72,7 +72,8 @@ CFLAGS := -g -Wall -O2 -mword-relocations \
-ffunction-sections \ -ffunction-sections \
$(ARCH) $(ARCH)
CFLAGS += $(INCLUDE) -DARM11 -D_3DS CFLAGS += $(INCLUDE) -DARM11 -D_3DS -DVERSION_MAJOR=$(VERSION_MAJOR) \
-DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO)
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=c++11 -std=gnu++11 CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=c++11 -std=gnu++11

View File

@ -1 +1 @@
<Project name="Savvy Manager"><Folder name="source"><Folder name="utils"><File path="source\utils\dumpdsp.cpp"></File><File path="source\utils\sha256.cpp"></File><File path="source\utils\sound.cpp"></File><File path="source\utils\stringtool.cpp"></File></Folder><File path="source\main.cpp"></File><File path="source\gui.cpp"></File><File path="source\savedata.cpp"></File><File path="source\charchange.cpp"></File><File path="source\tonccpy.c"></File><File path="source\musicchange.cpp"></File><File path="source\file_browse.cpp"></File><File path="source\settings.cpp"></File><File path="source\emblemchange.cpp"></File></Folder><Folder name="include"><Folder name="utils"><File path="include\utils\colors.hpp"></File><File path="include\utils\common.hpp"></File><File path="include\utils\dumpdsp.h"></File><File path="include\utils\sha256.h"></File><File path="include\utils\sound.h"></File><File path="include\utils\stringtool.h"></File></Folder><File path="include\gui.hpp"></File><File path="include\savedata.h"></File><File path="include\ss4charnames.h"></File><File path="include\tonccpy.h"></File><File path="include\import_ss4charnames.h"></File><File path="include\import_ss2charnames.h"></File><File path="include\import_ss3charnames.h"></File><File path="include\import_ss1charnames.h"></File><File path="include\ss3charnames.h"></File><File path="include\settings.h"></File><File path="include\file_browse.h"></File><File path="include\import_emblemnames.h"></File></Folder></Project> <Project name="Savvy Manager"><Folder name="source"><Folder name="utils"><File path="source\utils\dumpdsp.cpp"></File><File path="source\utils\sha256.cpp"></File><File path="source\utils\sound.cpp"></File><File path="source\utils\stringtool.cpp"></File></Folder><File path="source\main.cpp"></File><File path="source\gui.cpp"></File><File path="source\savedata.cpp"></File><File path="source\charchange.cpp"></File><File path="source\tonccpy.c"></File><File path="source\musicchange.cpp"></File><File path="source\file_browse.cpp"></File><File path="source\settings.cpp"></File><File path="source\emblemchange.cpp"></File></Folder><Folder name="include"><Folder name="utils"><File path="include\utils\colors.hpp"></File><File path="include\utils\common.hpp"></File><File path="include\utils\dumpdsp.h"></File><File path="include\utils\sha256.h"></File><File path="include\utils\sound.h"></File><File path="include\utils\stringtool.h"></File></Folder><File path="include\gui.hpp"></File><File path="include\savedata.h"></File><File path="include\ss4charnames.h"></File><File path="include\tonccpy.h"></File><File path="include\import_ss4charnames.h"></File><File path="include\import_ss2charnames.h"></File><File path="include\import_ss3charnames.h"></File><File path="include\import_ss1charnames.h"></File><File path="include\ss3charnames.h"></File><File path="include\settings.h"></File><File path="include\file_browse.h"></File><File path="include\import_emblemnames.h"></File></Folder><File path="Makefile"></File></Project>

View File

@ -1 +1 @@
<pd><ViewState><e p="Savvy Manager" x="true"></e><e p="Savvy Manager\include\utils" x="false"></e><e p="Savvy Manager\source\utils" x="false"></e><e p="Savvy Manager\include" x="true"></e><e p="Savvy Manager\source" x="true"></e></ViewState></pd> <pd><ViewState><e p="Savvy Manager" x="true"></e><e p="Savvy Manager\include" x="false"></e><e p="Savvy Manager\source" x="false"></e></ViewState></pd>

View File

@ -14,6 +14,8 @@
#define CONFIG_3D_SLIDERSTATE (*(float *)0x1FF81080) #define CONFIG_3D_SLIDERSTATE (*(float *)0x1FF81080)
static char verText[32];
extern void loadSettings(void); extern void loadSettings(void);
extern C3D_RenderTarget* top; extern C3D_RenderTarget* top;
@ -135,8 +137,8 @@ static void drawCannotEditMsg(void) {
Draw_Text(32, 100, 0.60, BLACK, "Checkpoint, and name the backup:"); Draw_Text(32, 100, 0.60, BLACK, "Checkpoint, and name the backup:");
Draw_Text(32, 124, 0.60, BLACK, "SavvyManager"); Draw_Text(32, 124, 0.60, BLACK, "SavvyManager");
} else { } else {
Draw_Text(32, 84, 0.60, BLACK, "Cannot edit this"); Draw_Text(32, 84, 0.60, BLACK, "Cannot edit Style Savvy's");
Draw_Text(32, 104, 0.60, BLACK, "game's save yet."); Draw_Text(32, 104, 0.60, BLACK, "save data yet.");
} }
Draw_Text(32, 160, 0.65, BLACK, " OK"); Draw_Text(32, 160, 0.65, BLACK, " OK");
} }
@ -223,6 +225,8 @@ int main()
ss2SaveFound = (access(ss2SavePath, F_OK) == 0); ss2SaveFound = (access(ss2SavePath, F_OK) == 0);
ss3SaveFound = (access(ss3SavePath, F_OK) == 0); ss3SaveFound = (access(ss3SavePath, F_OK) == 0);
ss4SaveFound = (access(ss4SavePath, F_OK) == 0); ss4SaveFound = (access(ss4SavePath, F_OK) == 0);
sprintf(verText, "Ver. %i.%i.%i", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
loadSettings(); loadSettings();
@ -322,6 +326,7 @@ int main()
} }
Draw_Text(8, 112, 0.55, BLACK, "<"); Draw_Text(8, 112, 0.55, BLACK, "<");
Draw_Text(304, 112, 0.55, BLACK, ">"); Draw_Text(304, 112, 0.55, BLACK, ">");
Draw_Text(248, 220, 0.50, BLACK, verText);
if (showMessage) { if (showMessage) {
drawCannotEditMsg(); drawCannotEditMsg();
} }