From e72202f3b86643077a73a2c75b8465ca1300c4f5 Mon Sep 17 00:00:00 2001 From: zeromus Date: Fri, 22 Feb 2019 15:01:12 -0500 Subject: [PATCH] fix linux build (probably) --- src/drivers/win/archive.cpp | 2 +- src/fceu.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/win/archive.cpp b/src/drivers/win/archive.cpp index 118aca61..23ea7eb9 100644 --- a/src/drivers/win/archive.cpp +++ b/src/drivers/win/archive.cpp @@ -277,7 +277,7 @@ public: // 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. -bool archiveManuallyCanceled; +extern bool archiveManuallyCanceled; static BOOL CALLBACK ArchiveFileSelectorCallback(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { diff --git a/src/fceu.cpp b/src/fceu.cpp index cb0d147f..d7129f7f 100644 --- a/src/fceu.cpp +++ b/src/fceu.cpp @@ -400,6 +400,7 @@ int FDSLoad(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 +bool archiveManuallyCanceled; //name should be UTF-8, hopefully, or else there may be trouble 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) { - extern bool archiveManuallyCanceled; // Although !fp, if the operation was canceled from archive select dialog box, don't show the error message; if (!silent && !archiveManuallyCanceled) FCEU_PrintError("´ò¿ª \"%s\" ´íÎó£¡", name);