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

Bring in the ICC patch that makes pcsx2 build on that compiler. 

Thanks to fea for this one ;)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@633 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2009-02-28 20:16:28 +00:00
parent 35386b1d2a
commit a801b6f091
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/windows/ini.cpp
View File

@ -198,8 +198,10 @@ void IniFile::DoConfig( PcsxConfig& Conf )
SetCurrentSection( "Interface" ); SetCurrentSection( "Interface" );
Entry( "Bios", Conf.Bios ); Entry( "Bios", Conf.Bios );
Entry( "Language", Conf.Lang ); Entry( "Language", Conf.Lang );
Entry( "PluginsDir", Conf.PluginsDir, DEFAULT_PLUGINS_DIR ); string plug = DEFAULT_PLUGINS_DIR;
Entry( "BiosDir", Conf.BiosDir, DEFAULT_BIOS_DIR ); Entry( "PluginsDir", Conf.PluginsDir, plug );
string bios = DEFAULT_BIOS_DIR;
Entry( "BiosDir", Conf.BiosDir, bios );
Entry( "CloseGsOnEscape", Conf.closeGSonEsc, true ); Entry( "CloseGsOnEscape", Conf.closeGSonEsc, true );
SetCurrentSection( "Console" ); SetCurrentSection( "Console" );

15
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -926,12 +926,17 @@ void recClearMem(BASEBLOCK* p)
int lastdelay; int lastdelay;
// necessary since recompiler doesn't call femms/emms // necessary since recompiler doesn't call femms/emms
#ifdef _MSC_VER #ifdef __INTEL_COMPILER
if (cpucaps.has3DNOWInstructionExtensions) __asm femms; __asm__("emms");
else __asm emms;
#else #else
if( cpucaps.has3DNOWInstructionExtensions )__asm__("femms"); #ifdef _MSC_VER
else __asm__("emms"); if (cpucaps.has3DNOWInstructionExtensions) __asm femms;
else __asm emms;
#else
if( cpucaps.has3DNOWInstructionExtensions )__asm__("femms");
else
__asm__("emms");
#endif
#endif #endif
assert( p != NULL ); assert( p != NULL );