diff options
author | Spec-Chum <spec-chum@users.sourceforge.net> | 2010-06-08 01:39:08 +0400 |
---|---|---|
committer | Spec-Chum <spec-chum@users.sourceforge.net> | 2010-06-08 01:39:08 +0400 |
commit | 5405d6ad0ca42f4d60d5cdde85f2e4f1d6aee3d5 (patch) | |
tree | 24b1b2e5b0480c7811d0cf9e915f576342a7f5c2 /src/thirdparty | |
parent | 14adf6b2d1c189aac0e4785a71b8f07fdd567ba4 (diff) |
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
Diffstat (limited to 'src/thirdparty')
-rw-r--r-- | src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj | 2 | ||||
-rw-r--r-- | src/thirdparty/VirtualDub/h/vd2/system/vdtypes.h | 2 |
2 files changed, 2 insertions, 2 deletions
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>
|