shithub: opus

Download patch

ref: 642084c47c0807686db4ae2def61a11dee80a81d
parent: eeb7bd3d9d4569ac556f1fd70434abea571f57f3
author: Gian-Carlo Pascutto <[email protected]>
date: Mon Jul 16 16:52:38 EDT 2012 

Output/intermediate dir cleanup and fixes in 64-bit mode.

Also make the 64-bit builds use the default output directories.
Fix the type of the default Opus output to be a library.


--- a/celt/celt.vcxproj
+++ b/celt/celt.vcxproj
@@ -62,18 +62,10 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>

-  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

--- a/silk/fixed/silk_fixed.vcxproj
+++ b/silk/fixed/silk_fixed.vcxproj
@@ -64,17 +64,9 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <TargetName>$(ProjectName)</TargetName>

-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>

-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>

-  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <TargetName>$(ProjectName)</TargetName>

-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>

-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>

-  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <PrecompiledHeader>

--- a/silk/float/silk_float.vcxproj
+++ b/silk/float/silk_float.vcxproj
@@ -64,17 +64,9 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <TargetName>$(ProjectName)</TargetName>

-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>

-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>

-  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <TargetName>$(ProjectName)</TargetName>

-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>

-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>

-  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <PrecompiledHeader>

--- a/silk/silk_common.vcxproj
+++ b/silk/silk_common.vcxproj
@@ -64,17 +64,9 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <TargetName>$(ProjectName)</TargetName>

-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>

-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>

-  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <TargetName>$(ProjectName)</TargetName>

-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>

-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>

-  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <PrecompiledHeader>

--- a/src/opus.vcxproj
+++ b/src/opus.vcxproj
@@ -29,7 +29,7 @@
     <UseDebugLibraries>true</UseDebugLibraries>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -38,7 +38,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -62,9 +62,6 @@
   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <LinkIncremental>true</LinkIncremental>

-    <TargetName>$(ProjectName)</TargetName>

-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>

-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <LinkIncremental>false</LinkIncremental>

@@ -71,8 +68,6 @@
   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <LinkIncremental>false</LinkIncremental>

-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>

-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>