From 71454df424c413d2c52ddc2a9c4416bd958833ce Mon Sep 17 00:00:00 2001 From: zilmar Date: Fri, 15 Apr 2016 08:29:45 +1000 Subject: [PATCH] [Project64] Make sure 7z in rombrowser is win32 only --- Source/Project64/UserInterface/RomList.cpp | 6 ++++++ Source/Project64/UserInterface/RomList.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/Source/Project64/UserInterface/RomList.cpp b/Source/Project64/UserInterface/RomList.cpp index 8a1437665..e5bd495ad 100644 --- a/Source/Project64/UserInterface/RomList.cpp +++ b/Source/Project64/UserInterface/RomList.cpp @@ -31,7 +31,9 @@ CRomList::CRomList() : m_RefreshThread(NULL), m_NotesIniFile(NULL), m_ExtIniFile(NULL), +#ifdef _WIN32 m_ZipIniFile(NULL), +#endif m_RomIniFile(NULL), m_WatchThreadID(0), m_WatchThread(NULL), @@ -42,7 +44,9 @@ CRomList::CRomList() : m_NotesIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_Notes).c_str()); m_ExtIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_ExtInfo).c_str()); m_RomIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str()); +#ifdef _WIN32 m_ZipIniFile = new CIniFile(g_Settings->LoadStringVal(RomList_7zipCache).c_str()); +#endif } } @@ -65,11 +69,13 @@ CRomList::~CRomList() delete m_RomIniFile; m_RomIniFile = NULL; } +#ifdef _WIN32 if (m_ZipIniFile) { delete m_ZipIniFile; m_ZipIniFile = NULL; } +#endif } void CRomList::RefreshRomList(void) diff --git a/Source/Project64/UserInterface/RomList.h b/Source/Project64/UserInterface/RomList.h index 904ed3020..353d54cf2 100644 --- a/Source/Project64/UserInterface/RomList.h +++ b/Source/Project64/UserInterface/RomList.h @@ -93,7 +93,9 @@ private: CIniFile * m_NotesIniFile; CIniFile * m_ExtIniFile; CIniFile * m_RomIniFile; +#ifdef _WIN32 CIniFile * m_ZipIniFile; +#endif HANDLE m_RefreshThread; stdstr m_WatchRomDir;