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

Tweak zzogl-pg's C::B file a bit. Slap a quick patch on pcsx2 so it compiles. (Jake will probably want to fix that properly...) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2949 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-05-05 09:10:22 +00:00
parent 298dbbd201
commit 546ead475b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/gui/RecentIsoList.cpp
View File

@ -62,7 +62,13 @@ void RecentIsoManager::OnChangedSelection( wxCommandEvent& evt )
ScopedCoreThreadPopup stopped_core; ScopedCoreThreadPopup stopped_core;
//SysUpdateIsoSrcFile( m_Items[i].Filename ); //SysUpdateIsoSrcFile( m_Items[i].Filename );
#ifdef __LINUX__
// Likely not what was intended, but it compiles for the moment...
SwapOrReset_Iso( NULL, stopped_core, m_Items[i].Filename, GetMsg_IsoImageChanged());
#else
// Getting a window from the menu?
SwapOrReset_Iso( m_Menu->GetWindow(), stopped_core, m_Items[i].Filename, GetMsg_IsoImageChanged()); SwapOrReset_Iso( m_Menu->GetWindow(), stopped_core, m_Items[i].Filename, GetMsg_IsoImageChanged());
#endif
stopped_core.AllowResume(); stopped_core.AllowResume();
} }

7
plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
View File

@ -30,6 +30,7 @@
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" />
<Add option="-W" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-DZEROGS_DEVBUILD" /> <Add option="-DZEROGS_DEVBUILD" />
@ -63,9 +64,9 @@
<Add option="-Wno-unused-value" /> <Add option="-Wno-unused-value" />
<Add option="-Wunused-variable" /> <Add option="-Wunused-variable" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-I/opt/cg/include -L/opt/cg/lib" /> <Add option="-I/opt/cg/include" />
<Add option="-fno-strict-aliasing" /> <Add option="-L/opt/cg/lib" />
<Add option="-pipe -msse -msse2" /> <Add option="-msse2" />
<Add option="-fno-regmove" /> <Add option="-fno-regmove" />
<Add option="-DZEROGS_SSE2" /> <Add option="-DZEROGS_SSE2" />
<Add directory="../../Linux" /> <Add directory="../../Linux" />