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

fix linux build (probably)

This commit is contained in:
zeromus 2019-02-22 15:01:12 -05:00
parent f14321113a
commit e72202f3b8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/win/archive.cpp
View File

@ -277,7 +277,7 @@ public:
// indicator for the open in archive dialog that if the load was canceled by the user. // indicator for the open in archive dialog that if the load was canceled by the user.
// TODO: Since I can't think of a better way to indicate it, hope someone could imporve it. // TODO: Since I can't think of a better way to indicate it, hope someone could imporve it.
bool archiveManuallyCanceled; extern bool archiveManuallyCanceled;
static BOOL CALLBACK ArchiveFileSelectorCallback(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) static BOOL CALLBACK ArchiveFileSelectorCallback(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {

2
src/fceu.cpp
View File

@ -400,6 +400,7 @@ int FDSLoad(const char *name, FCEUFILE *fp);
int NSFLoad(const char *name, FCEUFILE *fp); int NSFLoad(const char *name, FCEUFILE *fp);
//char lastLoadedGameName [2048] = {0,}; // hack for movie WRAM clearing on record from poweron //char lastLoadedGameName [2048] = {0,}; // hack for movie WRAM clearing on record from poweron
bool archiveManuallyCanceled;
//name should be UTF-8, hopefully, or else there may be trouble //name should be UTF-8, hopefully, or else there may be trouble
FCEUGI *FCEUI_LoadGameVirtual(const char *name, int OverwriteVidMode, bool silent) FCEUGI *FCEUI_LoadGameVirtual(const char *name, int OverwriteVidMode, bool silent)
@ -416,7 +417,6 @@ FCEUGI *FCEUI_LoadGameVirtual(const char *name, int OverwriteVidMode, bool silen
if (!fp) if (!fp)
{ {
extern bool archiveManuallyCanceled;
// Although !fp, if the operation was canceled from archive select dialog box, don't show the error message; // Although !fp, if the operation was canceled from archive select dialog box, don't show the error message;
if (!silent && !archiveManuallyCanceled) if (!silent && !archiveManuallyCanceled)
FCEU_PrintError("´ò¿ª \"%s\" ´íÎó£¡", name); FCEU_PrintError("´ò¿ª \"%s\" ´íÎó£¡", name);