diff --git a/Makefile b/Makefile index 0056b14..d88f339 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ RSF_FILE := app/build-cia.rsf #--------------------------------------------------------------------------------- ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -CFLAGS := -g -Wall -O2 -mword-relocations \ +CFLAGS := -g -Wall -Wno-psabi -O2 -mword-relocations \ -DVERSION_STRING=\"$(GIT_VER)\" \ -fomit-frame-pointer -ffunction-sections \ $(ARCH) diff --git a/source/screens/scriptlist.cpp b/source/screens/scriptlist.cpp index 02fe38f..3928747 100644 --- a/source/screens/scriptlist.cpp +++ b/source/screens/scriptlist.cpp @@ -30,7 +30,6 @@ #include "screens/scriptlist.hpp" #include "utils/config.hpp" -#include "utils/parse.hpp" #include #include @@ -53,6 +52,16 @@ std::string selectedTitle; std::string Desc = ""; nlohmann::json jsonFile; +std::string get(nlohmann::json json, const std::string &key, const std::string &key2) { + if(!json.contains(key)) return "MISSING: " + key; + if(!json.at(key).is_object()) return "NOT OBJECT: " + key; + + if(!json.at(key).contains(key2)) return "MISSING: " + key + "." + key2; + if(!json.at(key).at(key2).is_string()) return "NOT STRING: " + key + "." + key2; + + return json.at(key).at(key2).get_ref(); +} + Info parseInfo(std::string fileName) { FILE* file = fopen(fileName.c_str(), "rt"); if(!file) {