diff --git a/Binary/linux/Dolphin.ini b/Binary/linux/Dolphin.ini index 21ae2dd5c9..dfa4016e05 100644 --- a/Binary/linux/Dolphin.ini +++ b/Binary/linux/Dolphin.ini @@ -1,6 +1,7 @@ [General] LastFilename = -GCMPathes = 0 +GCMPathes = 1 +GCMPath0 = /home/ryan/Desktop/GCISOS [Core] GFXPlugin = Plugins/libzeroogl.so DSPPlugin = Plugins/libdsphle.so diff --git a/Binary/linux/WII/shared2/sys/SYSCONF b/Binary/linux/WII/shared2/sys/SYSCONF new file mode 100644 index 0000000000..8925006cdb Binary files /dev/null and b/Binary/linux/WII/shared2/sys/SYSCONF differ diff --git a/Binary/linux/WII/shared2/sys/readme.txt b/Binary/linux/WII/shared2/sys/readme.txt new file mode 100644 index 0000000000..140df0d38f --- /dev/null +++ b/Binary/linux/WII/shared2/sys/readme.txt @@ -0,0 +1 @@ +This SYSCONF file describes a single registered Wiimote, with the Bluetooth address used by Dolphin. diff --git a/Binary/linux/WII/title/00000001/00000002/data/setting.txt b/Binary/linux/WII/title/00000001/00000002/data/setting.txt new file mode 100644 index 0000000000..65f57c2ee9 Binary files /dev/null and b/Binary/linux/WII/title/00000001/00000002/data/setting.txt differ diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index aab14798d8..19acdc2671 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -52,10 +52,15 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios) { std::string Extension; SplitPath(m_strFilename, NULL, NULL, &Extension); - + #ifdef _WIN32 if (!_stricmp(Extension.c_str(), ".gcm") || !_stricmp(Extension.c_str(), ".iso") || !_stricmp(Extension.c_str(), ".gcz") ) + #else + if (!strcasecmp(Extension.c_str(), ".gcm") || //TODO(Sonic): Shouldn't these work on all platforms? + !strcasecmp(Extension.c_str(), ".iso") || + !strcasecmp(Extension.c_str(), ".gcz") ) + #endif { m_BootType = BOOT_ISO; DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(m_strFilename.c_str()); @@ -92,20 +97,32 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios) delete pVolume; } + #ifdef _WIN32 else if (!_stricmp(Extension.c_str(), ".elf")) + #else + else if (!strcasecmp(Extension.c_str(), ".elf")) + #endif { bWii = CBoot::IsElfWii(m_strFilename.c_str()); BaseDataPath = s_DataBasePath_USA; m_BootType = BOOT_ELF; bNTSC = true; } + #ifdef _WIN32 else if (!_stricmp(Extension.c_str(), ".bin")) + #else + else if (!strcasecmp(Extension.c_str(), ".bin")) + #endif { BaseDataPath = s_DataBasePath_USA; m_BootType = BOOT_BIN; bNTSC = true; } + #ifdef _WIN32 else if (!_stricmp(Extension.c_str(), ".dol")) + #else + else if (!strcasecmp(Extension.c_str(), ".dol")) + #endif { BaseDataPath = s_DataBasePath_USA; m_BootType = BOOT_DOL; diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp index f6019ef09c..1b3ad8cc92 100644 --- a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp +++ b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp @@ -110,7 +110,11 @@ XSymbolIndex FindSymbol(const char *name) for (int i = 0; i < (int)m_VectorSymbols.size(); i++) { const CSymbol& rSymbol = m_VectorSymbols[i]; - if (_stricmp(rSymbol.GetName().c_str(), name) == 0) + #ifdef _WIN32 + if (!_stricmp(rSymbol.GetName().c_str(), name)) + #else + if (!strcasecmp(rSymbol.GetName().c_str(), name)) + #endif { return (XSymbolIndex)i; } diff --git a/Source/Core/Core/Src/LogManager.cpp b/Source/Core/Core/Src/LogManager.cpp index a483c9884f..220961cbd5 100644 --- a/Source/Core/Core/Src/LogManager.cpp +++ b/Source/Core/Core/Src/LogManager.cpp @@ -51,8 +51,11 @@ CDebugger_Log::CDebugger_Log(const char* _szShortName, const char* _szName) : strcpy((char*)m_szName, _szName); strcpy((char*)m_szShortName, _szShortName); sprintf((char*)m_szFilename, "Logs/%s.txt", _szName); - + #ifdef _WIN32 _unlink(m_szFilename); + #else + unlink(m_szFilename); + #endif } CDebugger_Log::~CDebugger_Log(void) diff --git a/Source/Core/DebuggerWX/src/CodeView.cpp b/Source/Core/DebuggerWX/src/CodeView.cpp index ee75bb747d..3edc50be01 100644 --- a/Source/Core/DebuggerWX/src/CodeView.cpp +++ b/Source/Core/DebuggerWX/src/CodeView.cpp @@ -219,9 +219,9 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event) { int sel = Debugger::FindSymbol(selection); if (sel > 0) { - wxTextEntryDialog input_symbol(this, "Rename symbol:", wxGetTextFromUserPromptStr, Debugger::GetSymbol(sel).GetName().c_str()); + wxTextEntryDialog input_symbol(this, wxString::FromAscii("Rename symbol:"), wxGetTextFromUserPromptStr, wxString::FromAscii(Debugger::GetSymbol(sel).GetName().c_str())); if (input_symbol.ShowModal() == wxID_OK) { - Debugger::AccessSymbol(sel).SetName(input_symbol.GetValue().c_str()); + Debugger::AccessSymbol(sel).SetName(input_symbol.GetValue().mb_str()); } // redraw(); Host_NotifyMapLoaded(); diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.cpp b/Source/Core/DiscIO/Src/FileHandlerARC.cpp index cd53f7a980..e299a83334 100644 --- a/Source/Core/DiscIO/Src/FileHandlerARC.cpp +++ b/Source/Core/DiscIO/Src/FileHandlerARC.cpp @@ -225,7 +225,11 @@ CARCFile::FindFileInfo(std::string _rFullPath) const { for (size_t i = 0; i < m_FileInfoVector.size(); i++) { + #ifdef _WIN32 if (!_stricmp(m_FileInfoVector[i].m_FullPath.c_str(), _rFullPath.c_str())) + #else + if (!strcasecmp(m_FileInfoVector[i].m_FullPath.c_str(), _rFullPath.c_str())) //TODO(Sonic): Shouldn't this work in all platforms? + #endif { return(&m_FileInfoVector[i]); } diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp index 8632bcfede..e92d1109d5 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp @@ -164,7 +164,11 @@ CFileSystemGCWii::FindFileInfo(const char* _rFullPath) const { for (size_t i = 0; i < m_FileInfoVector.size(); i++) { + #ifdef _WIN32 if (!_stricmp(m_FileInfoVector[i].m_FullPath, _rFullPath)) + #else + if (!strcasecmp(m_FileInfoVector[i].m_FullPath, _rFullPath)) //TODO(Sonic): Shouldn't this work in all platforms? + #endif { return(&m_FileInfoVector[i]); }