blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-04-06 03:58:02 +08:00
Code Issues Projects Releases Wiki Activity

Update for buildtools changes.

Browse Source
This commit is contained in:
Steven Smith 2016-07-11 12:31:36 -07:00
parent 6696b675ae
commit 6f434279f6
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -27,9 +27,15 @@ EXTRA_OUTPUT_FILES :=
LIBRARY_DIRS := $(DEVKITPRO)/libctru LIBRARY_DIRS := $(DEVKITPRO)/libctru
LIBRARIES := citro3d ctru m LIBRARIES := citro3d ctru m
BUILD_FLAGS := -DLIBKHAX_AS_LIB -DVERSION_STRING="\"`git describe --tags --abbrev=0`\"" BUILD_FLAGS :=
RUN_FLAGS := RUN_FLAGS :=
VERSION_PARTS := $(subst ., ,$(shell git describe --tags --abbrev=0))
VERSION_MAJOR := $(word 1, $(VERSION_PARTS))
VERSION_MINOR := $(word 2, $(VERSION_PARTS))
VERSION_MICRO := $(word 3, $(VERSION_PARTS))
# 3DS CONFIGURATION # # 3DS CONFIGURATION #
TITLE := $(NAME) TITLE := $(NAME)

2
buildtools

@ -1 +1 @@
Subproject commit 616b50ec1b82f6dac3a2694ed9d2ba3012f5f6f5 Subproject commit 73d9327d4227e01c85c6404d7cee747d34e24881

7
source/ui/section/update.c
View File

@ -211,7 +211,10 @@ static void update_check_update(ui_view* view, void* data, float* progress, char
} }
if(name != NULL && assets != NULL) { if(name != NULL && assets != NULL) {
if(strncmp(name->u.string.ptr, VERSION_STRING, name->u.string.length) != 0) { char versionString[16];
snprintf(versionString, sizeof(versionString), "%d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
if(strncmp(name->u.string.ptr, versionString, name->u.string.length) != 0) {
char* url = NULL; char* url = NULL;
for(u32 i = 0; i < assets->u.array.length; i++) { for(u32 i = 0; i < assets->u.array.length; i++) {
@ -341,4 +344,4 @@ void update_open() {
data->installInfo.finished = true; data->installInfo.finished = true;
prompt_display("Confirmation", "Check for FBI updates?", COLOR_TEXT, true, data, NULL, update_onresponse); prompt_display("Confirmation", "Check for FBI updates?", COLOR_TEXT, true, data, NULL, update_onresponse);
} }

2
source/ui/ui.c
View File

@ -138,7 +138,7 @@ static void ui_draw_top(ui_view* ui) {
screen_draw_texture(TEXTURE_TOP_SCREEN_BOTTOM_BAR_SHADOW, topScreenBottomBarX, topScreenBottomBarY - topScreenBottomBarShadowHeight, topScreenBottomBarShadowWidth, topScreenBottomBarShadowHeight); screen_draw_texture(TEXTURE_TOP_SCREEN_BOTTOM_BAR_SHADOW, topScreenBottomBarX, topScreenBottomBarY - topScreenBottomBarShadowHeight, topScreenBottomBarShadowWidth, topScreenBottomBarShadowHeight);
char verText[64]; char verText[64];
snprintf(verText, 64, "Ver. %s", VERSION_STRING); snprintf(verText, 64, "Ver. %d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
float verWidth; float verWidth;
float verHeight; float verHeight;