ref: ea1576282e75856091a0b21576a1e5da63897951
parent: 3532f5f3e06ea0565ea74a71b4169936e7b52fb4
author: Ralph Giles <giles@mozilla.com>
date: Fri Dec 7 07:33:18 EST 2012
Remove MSVC incremental linking directives. This avoids linker errors with VS2010 of the form failure during conversion to COFF: invalid file or corrupt [c:\users\giles\opus\source\opus_demo.vcxproj] The problem does not occur if the project files are updated to build under VS2012.
--- a/src/opusdec.vcxproj
+++ b/src/opusdec.vcxproj
@@ -88,22 +88,18 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\Debug;..\..\libogg\win32\VS2010\Win32\Debug;$(LibraryPath)</LibraryPath>
<IntDir>$(Configuration)_opusdec\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\x64\Debug;..\..\libogg\win32\VS2010\x64\Debug;$(LibraryPath)</LibraryPath>
<IntDir>$(Platform)\$(Configuration)_opusdec\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\Release;..\..\libogg\win32\VS2010\Win32\Release;$(LibraryPath)</LibraryPath>
<IntDir>$(Configuration)_opusdec\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\x64\Release;..\..\libogg\win32\VS2010\x64\Release;$(LibraryPath)</LibraryPath>
<IntDir>$(Platform)\$(Configuration)_opusdec\</IntDir>
</PropertyGroup>
@@ -230,4 +226,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
--- a/src/opusenc.vcxproj
+++ b/src/opusenc.vcxproj
@@ -88,22 +88,18 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\Debug;..\..\libogg\win32\VS2010\Win32\Debug;$(LibraryPath)</LibraryPath>
<IntDir>$(Configuration)_opusenc\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\x64\Debug;..\..\libogg\win32\VS2010\x64\Debug;$(LibraryPath)</LibraryPath>
<IntDir>$(Platform)\$(Configuration)_opusenc\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\Release;..\..\libogg\win32\VS2010\Win32\Release;$(LibraryPath)</LibraryPath>
<IntDir>$(Configuration)_opusenc\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\x64\Release;..\..\libogg\win32\VS2010\x64\Release;$(LibraryPath)</LibraryPath>
<IntDir>$(Platform)\$(Configuration)_opusenc\</IntDir>
</PropertyGroup>
@@ -230,4 +226,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
--- a/src/opusinfo.vcxproj
+++ b/src/opusinfo.vcxproj
@@ -89,22 +89,18 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\Debug;..\..\libogg\win32\VS2010\Win32\Debug;$(LibraryPath)</LibraryPath>
<IntDir>$(Configuration)_opusinfo\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\x64\Debug;..\..\libogg\win32\VS2010\x64\Debug;$(LibraryPath)</LibraryPath>
<IntDir>$(Platform)\$(Configuration)_opusinfo\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\Release;..\..\libogg\win32\VS2010\Win32\Release;$(LibraryPath)</LibraryPath>
<IntDir>$(Configuration)_opusinfo\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>true</LinkIncremental>
<LibraryPath>..\..\opus\x64\Release;..\..\libogg\win32\VS2010\x64\Release;$(LibraryPath)</LibraryPath>
<IntDir>$(Platform)\$(Configuration)_opusinfo\</IntDir>
</PropertyGroup>
@@ -231,4 +227,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>