From a801b6f09175480dfed62e5ecdfe76d571f32dc3 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <ramapcsx2@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 28 Feb 2009 20:16:28 +0000
Subject: [PATCH] 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
---
 pcsx2/windows/ini.cpp           |  6 ++++--
 pcsx2/x86/ix86-32/iR5900-32.cpp | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pcsx2/windows/ini.cpp b/pcsx2/windows/ini.cpp
index b5032737a5..f935721d20 100644
--- a/pcsx2/windows/ini.cpp
+++ b/pcsx2/windows/ini.cpp
@@ -198,8 +198,10 @@ void IniFile::DoConfig( PcsxConfig& Conf )
 	SetCurrentSection( "Interface" );
 	Entry( "Bios", Conf.Bios );
 	Entry( "Language", Conf.Lang );
-	Entry( "PluginsDir", Conf.PluginsDir, DEFAULT_PLUGINS_DIR );
-	Entry( "BiosDir", Conf.BiosDir, DEFAULT_BIOS_DIR );
+	string plug = DEFAULT_PLUGINS_DIR;
+	Entry( "PluginsDir", Conf.PluginsDir, plug );
+	string bios = DEFAULT_BIOS_DIR;
+	Entry( "BiosDir", Conf.BiosDir, bios );
 	Entry( "CloseGsOnEscape", Conf.closeGSonEsc, true );
 
 	SetCurrentSection( "Console" );
diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp
index 65ad3635be..6e31a17ae3 100644
--- a/pcsx2/x86/ix86-32/iR5900-32.cpp
+++ b/pcsx2/x86/ix86-32/iR5900-32.cpp
@@ -926,12 +926,17 @@ void recClearMem(BASEBLOCK* p)
 	int lastdelay;
 
 	// necessary since recompiler doesn't call femms/emms
-#ifdef _MSC_VER
-	if (cpucaps.has3DNOWInstructionExtensions) __asm femms;
-	else __asm emms;
+#ifdef __INTEL_COMPILER
+		__asm__("emms");
 #else
-    if( cpucaps.has3DNOWInstructionExtensions )__asm__("femms");
-    else __asm__("emms");
+	#ifdef _MSC_VER
+		if (cpucaps.has3DNOWInstructionExtensions) __asm femms;
+		else __asm emms;
+	#else
+		if( cpucaps.has3DNOWInstructionExtensions )__asm__("femms");
+		else 
+			__asm__("emms");
+	#endif
 #endif
 		
 	assert( p != NULL );