Fix: ICL now compiles with all 4 configs (x86 and x64 both debug and release)

Fix: About box didn't open with ICL (should fix same issue with VS2010 too)
Fix: Crash when opening internal filter property page when compiled using ICL
Added: ICL now added to MPC-HC Compiler section of about box if used to compile MPC-HC

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2015 10f7b99b-c216-0410-bff0-8a66a9350fd8

8 files changed, 36 insertions, 19 deletions

diff --git a/src/DSUtil/mmintrin64.c b/src/DSUtil/mmintrin64.c
index d64bb4d2c..5c5fbcac2 100644
--- a/src/DSUtil/mmintrin64.c
+++ b/src/DSUtil/mmintrin64.c
@@ -22,6 +22,10 @@
 

 // I'd release it into the public domain if my jurisdiction had an effective and meaningful way of doing so, but it doesn't, so I won't.

 

+

+// ICL doesn't support __m64 unions

+#ifndef __INTEL_COMPILER

+

 #include "simd_common.h"

 

 // MMX

@@ -1003,3 +1007,5 @@ __m64 _mm_movepi64_pi64(__m128i _Q)
     rv.m64_i64 = _Q.m128i_i64[0];

     return rv;

 }

+

+#endif

diff --git a/src/apps/mplayerc/PPageInternalFilters.cpp b/src/apps/mplayerc/PPageInternalFilters.cpp
index 4ef162637..00fb32b40 100644
--- a/src/apps/mplayerc/PPageInternalFilters.cpp
+++ b/src/apps/mplayerc/PPageInternalFilters.cpp
@@ -409,7 +409,7 @@ BOOL CPPageInternalFilters::OnInitDialog()
 

     AppSettings& s = AfxGetAppSettings();

 

-    for(int i = 0; i < countof(s_filters); i++)

+    for(int i = 0; i < countof(s_filters)-1; i++)

     {

         CCheckListBox* l;

         UINT* pflags;

diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp
index 92aed467e..156953ec2 100644
--- a/src/apps/mplayerc/mplayerc.cpp
+++ b/src/apps/mplayerc/mplayerc.cpp
@@ -236,16 +236,27 @@ public:
         UpdateData();

         m_strBuildNumber = AfxGetMyApp()->m_strVersion;

 

-#if (_MSC_VER == 1600)

+#ifdef __INTEL_COMPILER

+	#if (__INTEL_COMPILER >= 1100)

+		m_MPCCompiler = _T("ICL 11.x");

+	#elif (__INTEL_COMPILER >= 1000)

+		m_MPCCompiler = _T("ICL 10.x");

+	#else

+		#error Compiler is not supported!

+	#endif

+

+#else

+	#if (_MSC_VER == 1600)

         m_MPCCompiler = _T("MSVC 2010");

-#elif (_MSC_VER == 1500)

-#if (_MSC_FULL_VER >= 150030729)

+	#elif (_MSC_VER == 1500)

+	#if (_MSC_FULL_VER >= 150030729)

         m_MPCCompiler = _T("MSVC 2008 SP1");

-#else

+	#else

         m_MPCCompiler = _T("MSVC 2008");

-#endif

-#elif (_MSC_VER < 1500)

-#error Compiler is not supported!

+	#endif

+	#elif (_MSC_VER < 1500)

+		#error Compiler is not supported!

+	#endif

 #endif

 

 #if INCLUDE_MPC_VIDEO_DECODER | INCLUDE_MPC_DXVA_VIDEO_DECODER

diff --git a/src/apps/mplayerc/stdafx.h b/src/apps/mplayerc/stdafx.h
index 6304ad76d..65d3783d1 100644
--- a/src/apps/mplayerc/stdafx.h
+++ b/src/apps/mplayerc/stdafx.h
@@ -78,6 +78,8 @@
 #include <gdiplus.h>

 #pragma comment(lib, "gdiplus.lib")

 

+#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")

+

 template <class T = CString, class S = CString>

 class CAtlStringMap : public CAtlMap<S, T, CStringElementTraits<S> > {};

 

diff --git a/src/filters/parser/AviSplitter/AviFile.cpp b/src/filters/parser/AviSplitter/AviFile.cpp
index 315a03741..8e98d906b 100644
--- a/src/filters/parser/AviSplitter/AviFile.cpp
+++ b/src/filters/parser/AviSplitter/AviFile.cpp
@@ -13,14 +13,6 @@ CAviFile::CAviFile(IAsyncReader* pAsyncReader, HRESULT& hr)
 	hr = Init();

 }

 

-template<typename T> 

-HRESULT CAviFile::Read(T& var, int offset)

-{

-	memset(&var, 0, sizeof(var));

-	HRESULT hr = ByteRead((BYTE*)&var + offset, sizeof(var) - offset);

-	return hr;

-}

-

 HRESULT CAviFile::Init()

 {

 	Seek(0);

diff --git a/src/filters/parser/AviSplitter/AviFile.h b/src/filters/parser/AviSplitter/AviFile.h
index 6ef8cf9d3..dfc851426 100644
--- a/src/filters/parser/AviSplitter/AviFile.h
+++ b/src/filters/parser/AviSplitter/AviFile.h
@@ -13,7 +13,13 @@ public:
 	CAviFile(IAsyncReader* pAsyncReader, HRESULT& hr);

 

 	//using CBaseSplitterFile::Read;

-	template<typename T> HRESULT Read(T& var, int offset = 0);

+	template<typename T>

+	HRESULT Read(T& var, int offset = 0)

+	{

+		memset(&var, 0, sizeof(var));

+		HRESULT hr = ByteRead((BYTE*)&var + offset, sizeof(var) - offset);

+		return hr;

+	}

 

 	AVIMAINHEADER m_avih;

 	struct ODMLExtendedAVIHeader {DWORD dwTotalFrames;} m_dmlh;

diff --git a/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj b/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj
index 8eb656c51..559fa420f 100644
--- a/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj
+++ b/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="Kasumi"

 	ProjectGUID="{0D252872-7542-4232-8D02-53F9182AEE15}"

 	RootNamespace="Kasumi"

diff --git a/src/thirdparty/VirtualDub/h/vd2/system/vdtypes.h b/src/thirdparty/VirtualDub/h/vd2/system/vdtypes.h
index 0a5a63e50..5e5bdc898 100644
--- a/src/thirdparty/VirtualDub/h/vd2/system/vdtypes.h
+++ b/src/thirdparty/VirtualDub/h/vd2/system/vdtypes.h
@@ -272,7 +272,7 @@ extern void VDDebugPrint(const char *format, ...);
 #endif

 

 

-#ifdef _DEBUG

+#if defined(_DEBUG) && !defined(__INTEL_COMPILER) /* MPC specific - Cannot use these macros with ICL */

 

 	namespace {

 		template<int line>