From 28e7e85bbfcaf67672c28efcc8c0016bbc2ac7b0 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 13 May 2019 11:38:20 +0200
Subject: [PATCH] sys: minor tweaks to filesystem load order.

---
 src/sys/init.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/sys/init.cpp b/src/sys/init.cpp
index 855b5506..55775e9e 100644
--- a/src/sys/init.cpp
+++ b/src/sys/init.cpp
@@ -54,7 +54,7 @@ void init(int argc, char *argv[],
      * and emscripten, and the current directory on other platforms.
      */
 
-#if __ANDROID__ || __EMSCRIPTEN__
+#if __ANDROID__ || __EMSCRIPTEN__ || __NX__
     std::string binarydir = "";
 #else
     std::string binarydir = ".";
@@ -93,9 +93,11 @@ void init(int argc, char *argv[],
     {
         /* This data dir is for standalone executables */
         std::string rootdir = binarydir;
+#if !__NX__
         if (rootdir.length() && rootdir.back() != SEPARATOR)
             rootdir += SEPARATOR;
         add_data_dir(rootdir);
+#endif
 
         /* This data dir is for engine stuff */
         rootdir = solutiondir;
@@ -174,7 +176,9 @@ array<std::string> get_path_list(std::string const &file)
             ret << data_dir[i] + file;
     }
 
+#if !__NX__
     ret << file;
+#endif
 
     return ret;
 }