Update for 2.4.1

Nanquitas · Feb 5, 2017 · 52fdb66 · 52fdb66
1 parent c4ba18c
commit 52fdb66
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ LIBRARIES := citro3d ctru png z m
 
 VERSION_MAJOR := 2
 VERSION_MINOR := 4
-VERSION_MICRO := 0
+VERSION_MICRO := 1
 
 
 
@@ -44,7 +44,8 @@ BUILD_FLAGS_CC := -g -Wall -Wno-strict-aliasing -O3 -mword-relocations \
  -fomit-frame-pointer -ffast-math $(ARCH) $(INCLUDE) -DARM11 -D_3DS $(BUILD_FLAGS) \
  -DFONZD_BANNER=${FONZD} -DPABLOMK7_BANNER=${PABLOMK7} \
  -DAPP_VERSION_MAJOR=${VERSION_MAJOR} \
- -DAPP_VERSION_MINOR=${VERSION_MINOR}
+ -DAPP_VERSION_MINOR=${VERSION_MINOR} \
+ -DAPP_VERSION_REVISION=${VERSION_MICRO}
 BUILD_FLAGS_CXX := $(COMMON_FLAGS) -std=gnu++11
 RUN_FLAGS :=
 

diff --git a/romfs/ntr_3_4.bin b/romfs/ntr_3_4.bin
diff --git a/source/config.h b/source/config.h
@@ -9,7 +9,7 @@
  (((major)<<24)|((minor)<<16)|((revision)<<8))
 #endif
 
-#define CURRENT_CONFIG_VERSION SYSTEM_VERSION(1, 0, 0)
+#define CURRENT_CONFIG_VERSION SYSTEM_VERSION(1, 0, 1)
 
 #define SECONDS_IN_WEEK 604800
 #define SECONDS_IN_DAY 86400

diff --git a/source/graphics.c b/source/graphics.c
@@ -40,7 +40,10 @@ void initUI(void)
  appTop = newAppInfoObject(topInfoSprite, 14, 55.0f, 30.0f);
  appInfoSetTextBoundaries(appTop, 345.0f, 210.0f);
 
- sprintf(appVersion, "Version: %d.%d", APP_VERSION_MAJOR, APP_VERSION_MINOR);
+ if (!APP_VERSION_REVISION)
+ sprintf(appVersion, "Version: %d.%d", APP_VERSION_MAJOR, APP_VERSION_MINOR);
+ else
+ sprintf(appVersion, "Version: %d.%d.%d", APP_VERSION_MAJOR, APP_VERSION_MINOR, APP_VERSION_REVISION);
  updateUI();
 }
 

diff --git a/source/updater.c b/source/updater.c
@@ -253,8 +253,11 @@ static Result parseResponseData(const char *jsonText, u32 size, bool *hasUpdate)
  changelog = val->u.string.ptr;
  }
  if (name != NULL && assets != NULL)
- { 
- snprintf(versionString, sizeof(versionString), "%d.%d", APP_VERSION_MAJOR, APP_VERSION_MINOR);
+ { 
+ if (!APP_VERSION_REVISION)
+ snprintf(versionString, sizeof(versionString), "%d.%d", APP_VERSION_MAJOR, APP_VERSION_MINOR);
+ else
+ snprintf(versionString, sizeof(versionString), "%d.%d.%d", APP_VERSION_MAJOR, APP_VERSION_MINOR, APP_VERSION_REVISION);
  if (strncmp(name->u.string.ptr, versionString, name->u.string.length) > 0)
  { 
  for (i = 0; i < assets->u.array.length; i++)