From 890c52d79078f6fc9aa91b1d8c1bc4f0c4c79b87 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 2 Jan 2016 13:37:52 +0100 Subject: [PATCH] Use ndless_resources.tns in installer-3.6 as well --- ndless/calcbin/ndless_resources_3.6.tns | 1 - ndless/src/installer-3.6/stage2.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 120000 ndless/calcbin/ndless_resources_3.6.tns diff --git a/ndless/calcbin/ndless_resources_3.6.tns b/ndless/calcbin/ndless_resources_3.6.tns deleted file mode 120000 index e76fd947..00000000 --- a/ndless/calcbin/ndless_resources_3.6.tns +++ /dev/null @@ -1 +0,0 @@ -ndless_resources.tns \ No newline at end of file diff --git a/ndless/src/installer-3.6/stage2.cpp b/ndless/src/installer-3.6/stage2.cpp index 9b0c221f..8365ee4d 100644 --- a/ndless/src/installer-3.6/stage2.cpp +++ b/ndless/src/installer-3.6/stage2.cpp @@ -84,14 +84,14 @@ static unsigned const ndless_inst_resident_hook_addrs[] = {0x10012598, 0x1001251 // Install the resident part HOOK_DEFINE(s1_startup_hook) { struct nuc_stat res_stat; - const char *res_path = "/documents/ndless/ndless_resources_3.6.tns"; + const char *res_path = "/documents/ndless/ndless_resources.tns"; NUC_FILE *res_file; char *core; char *res_params = NULL; if (!(res_file = syscall_local(res_path, "rb"))) { int x = 0; - syscall_local("Oops, you've forgotten to transfer 'ndless_resources_3.6'! Ndless won't be installed.", &x, 10); + syscall_local("Oops, you've forgotten to transfer 'ndless_resources.tns'! Ndless won't be installed.", &x, 10); volatile int i; for (i = 0; i < 100000000; i++) // libndls's sleep() requires is_classic, not available here ;