Merge branch 'master' of https://github.com/Arisotura/melonDS into feature/qt-platform

2 files changed, 4 insertions, 1 deletions

diff --git a/msys-dist.sh b/msys-dist.sh
index 01b2ade..87c9d7e 100755
--- a/msys-dist.sh
+++ b/msys-dist.sh
@@ -10,3 +10,5 @@ mkdir -p dist
 for lib in $(ldd melonDS.exe | grep mingw | sed "s/.*=> //" | sed "s/(.*)//"); do
 	cp "${lib}" dist
 done
+
+cp melonDS.exe dist
\ No newline at end of file
diff --git a/src/DSi_SD.cpp b/src/DSi_SD.cpp
index 751c64f..7fdba0f 100644
--- a/src/DSi_SD.cpp
+++ b/src/DSi_SD.cpp
@@ -22,6 +22,7 @@
 #include "DSi_SD.h"
 #include "DSi_NWifi.h"
 #include "Platform.h"
+#include "Config.h"
 
 
 // observed IRQ behavior during transfers
@@ -122,7 +123,7 @@ void DSi_SDHost::Reset()
         sd->SetCID(sd_cid);*/
         DSi_MMCStorage* sd = NULL;
 
-        DSi_MMCStorage* mmc = new DSi_MMCStorage(this, true, "nand.bin");
+        DSi_MMCStorage* mmc = new DSi_MMCStorage(this, true, Config::DSiNANDPath);
         mmc->SetCID(DSi::eMMC_CID);
 
         Ports[0] = sd;