diff --git a/makefile b/makefile index 0def044..42cc5c3 100644 --- a/makefile +++ b/makefile @@ -55,8 +55,6 @@ bundle: cp ./src/boot/output/dmenu.bin ./build/BASE cp ./src/boot/output/dmenu.bin ./build/SYSTEM/rg35xx/dat cp ./src/install/install.sh ./build/SYSTEM/rg35xx/bin - echo "$(BUILD_HASH)" > ./build/SYSTEM/commit.txt - echo "$(RELEASE_NAME)" > ./build/SYSTEM/release.txt # prepare boot logo cd ./build/SYSTEM/rg35xx/dat && convert boot_logo.png -type truecolor boot_logo.bmp && rm boot_logo.png && gzip -n boot_logo.bmp @@ -91,7 +89,7 @@ readmes: fmt -w 40 -s ./skeleton/EXTRAS/README.txt > ./build/EXTRAS/README.txt zip: - cd ./build/SYSTEM/rg35xx/paks/MinUI.pak && echo "$(RELEASE_NAME)\n$(BUILD_HASH)" > version.txt + cd ./build/SYSTEM && echo "$(RELEASE_NAME)\n$(BUILD_HASH)" > version.txt cd ./build && find . -type f -name '.DS_Store' -delete mkdir -p ./build/PAYLOAD mv ./build/SYSTEM ./build/PAYLOAD/.system diff --git a/src/common/defines.h b/src/common/defines.h index ac52737..acc9f58 100644 --- a/src/common/defines.h +++ b/src/common/defines.h @@ -29,6 +29,7 @@ #define SDCARD_PATH "/mnt/sdcard" #define ROMS_PATH SDCARD_PATH "/Roms" +#define ROOT_SYSTEM_PATH SDCARD_PATH "/.system/" #define SYSTEM_PATH SDCARD_PATH "/.system/" PLATFORM #define RES_PATH SDCARD_PATH "/.system/res" #define FONT_PATH RES_PATH "/BPreplayBold-unhinted.otf" diff --git a/src/minui/main.c b/src/minui/main.c index cd49e7c..0e2914a 100644 --- a/src/minui/main.c +++ b/src/minui/main.c @@ -1335,7 +1335,7 @@ int main (int argc, char *argv[]) { if (!version) { // TODO: load from a file char release[256]; - getFile("./version.txt", release, 256); + getFile(ROOT_SYSTEM_PATH "/version.txt", release, 256); char *tmp,*commit; commit = strrchr(release, '\n'); diff --git a/todo.txt b/todo.txt index df6419a..c9f044e 100644 --- a/todo.txt +++ b/todo.txt @@ -16,17 +16,15 @@ rewrite/add repo url BASE/README.txt EXTRAS/README.txt - minarch - make 2x1,2x3,4x2 _c16 scalers and hook up some cores can only fast forward with prevent tearing off can this be set as an override preference? change Frontend > Scanlines/Grid to Screen Effect (None, Scanlines, Grid, LCD) and Shortcuts > Toggle Scanlines to Cycle Effect - eggs might make a few mixed neon scalers, eg. 2x1,2x3,4x2 so we're pushing fewer pixels + or don't because my cpu scalers are bad minui - restore MENU display version(s) + - common move battery check to thread?