ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/msu1' into msu1

This commit is contained in:
qwertymodo 2016-11-03 13:12:40 -07:00
parent f13676cfd3 1f7926c48b
commit 7c86cfd3e0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/Makefile.am
View File

@ -136,6 +136,11 @@ snes9x_gtk_SOURCES += \
../apu/bapu/smp/smp.cpp \
../apu/bapu/smp/smp_state.cpp
# MSU1
snes9x_gtk_SOURCES += \
../msu1.cpp \
../msu1.h
# DSP
snes9x_gtk_SOURCES += \
../dsp.cpp \

3
memmap.cpp
View File

@ -201,6 +201,7 @@
#endif
#include <ctype.h>
#include <sys/stat.h>
#include "snes9x.h"
#include "memmap.h"
@ -1889,7 +1890,7 @@ bool8 CMemory::LoadMultiCartInt ()
memmove(ROM + Multi.cartOffsetA, ROM, Multi.cartSizeA + Multi.cartSizeB);
else if(Multi.cartOffsetB) // clear cart A so the bios can detect that it's not present
memset(ROM, 0, Multi.cartOffsetB);
FILE *fp;
size_t size;
char path[PATH_MAX + 1];