mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-01 07:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #135 from bagedevimo/path-fix

Browse Source 
Nix Path fix.
This commit is contained in:
Alexandro Sánchez Bach 2014-03-29 09:50:26 +01:00
commit 4c6aa34810
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpcs3/Emu/FS/vfsLocalFile.cpp
View File

@ -35,19 +35,19 @@ bool vfsLocalFile::Open(const wxString& path, vfsOpenMode mode)
{ {
Close(); Close();
if(m_device) // if(m_device)
{ // {
if(!m_file.Access(vfsDevice::GetWinPath(m_device->GetLocalPath(), path), vfs2wx_mode(mode))) return false; // if(!m_file.Access(vfsDevice::GetWinPath(m_device->GetLocalPath(), path), vfs2wx_mode(mode))) return false;
return m_file.Open(vfsDevice::GetWinPath(m_device->GetLocalPath(), path), vfs2wx_mode(mode)) && // return m_file.Open(vfsDevice::GetWinPath(m_device->GetLocalPath(), path), vfs2wx_mode(mode)) &&
vfsFileBase::Open(vfsDevice::GetPs3Path(m_device->GetPs3Path(), path), mode); // vfsFileBase::Open(vfsDevice::GetPs3Path(m_device->GetPs3Path(), path), mode);
} // }
else // else
{ // {
if(!m_file.Access(path, vfs2wx_mode(mode))) return false; if(!m_file.Access(path, vfs2wx_mode(mode))) return false;
return m_file.Open(path, vfs2wx_mode(mode)) && vfsFileBase::Open(path, mode); return m_file.Open(path, vfs2wx_mode(mode)) && vfsFileBase::Open(path, mode);
} // }
} }
bool vfsLocalFile::Create(const wxString& path) bool vfsLocalFile::Create(const wxString& path)

3
rpcs3/Emu/GS/GL/OpenGL.cpp
View File

@ -39,6 +39,9 @@ void OpenGL::Init()
#include "GLProcTable.tbl" #include "GLProcTable.tbl"
#undef OPENGL_PROC #undef OPENGL_PROC
#undef OPENGL_PROC2 #undef OPENGL_PROC2
#elif __UNIX__
glewExperimental = true;
glewInit();
#endif #endif
} }