piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-24 14:49:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nadia Holmquist Pedersen
2020-06-03 14:31:02 +02:00
parent f9f366e296 1abcb4e6ac
commit 54edd51797
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
msys-dist.sh
View File

@ -10,3 +10,5 @@ mkdir -p dist
for lib in $(ldd melonDS.exe | grep mingw | sed "s/.*=> //" | sed "s/(.*)//"); do for lib in $(ldd melonDS.exe | grep mingw | sed "s/.*=> //" | sed "s/(.*)//"); do
cp "${lib}" dist cp "${lib}" dist
done done
cp melonDS.exe dist

3
src/DSi_SD.cpp
View File

@ -22,6 +22,7 @@
#include "DSi_SD.h" #include "DSi_SD.h"
#include "DSi_NWifi.h" #include "DSi_NWifi.h"
#include "Platform.h" #include "Platform.h"
#include "Config.h"
// observed IRQ behavior during transfers // observed IRQ behavior during transfers
@ -122,7 +123,7 @@ void DSi_SDHost::Reset()
sd->SetCID(sd_cid);*/ sd->SetCID(sd_cid);*/
DSi_MMCStorage* sd = NULL; 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); mmc->SetCID(DSi::eMMC_CID);
Ports[0] = sd; Ports[0] = sd;