Compare commits

..

No commits in common. "master" and "v1.13.0" have entirely different histories.

2 changed files with 10 additions and 6 deletions

View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT([switch-tools],[1.13.1],[https://github.com/switchbrew/switch-tools/issues]) AC_INIT([switch-tools],[1.13.0],[https://github.com/switchbrew/switch-tools/issues])
AC_CONFIG_SRCDIR([src/build_pfs0.c]) AC_CONFIG_SRCDIR([src/build_pfs0.c])
AM_INIT_AUTOMAKE([subdir-objects]) AM_INIT_AUTOMAKE([subdir-objects])

View File

@ -830,11 +830,15 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
int allow_debug = 0; int allow_debug = 0;
int force_debug = 0; int force_debug = 0;
int force_debug_prod = 0; int force_debug_prod = 0;
cJSON_GetBoolean(value, "allow_debug", &allow_debug); if (!cJSON_GetBoolean(value, "allow_debug", &allow_debug)) {
cJSON_GetBoolean(value, "force_debug", &force_debug); status = 0;
cJSON_GetBoolean(value, "force_debug_prod", &force_debug_prod); goto NPDM_BUILD_END;
if ( allow_debug + force_debug + force_debug_prod > 1 ) { }
fprintf(stderr, "Only one of allow_debug, force_debug, or force_debug_prod can be set!\n"); if (!cJSON_GetBoolean(value, "force_debug", &force_debug)) {
status = 0;
goto NPDM_BUILD_END;
}
if (!cJSON_GetBoolean(value, "force_debug_prod", &force_debug_prod)) {
status = 0; status = 0;
goto NPDM_BUILD_END; goto NPDM_BUILD_END;
} }