Output/intermediate dir cleanup and fixes in 64-bit mode.
authorGian-Carlo Pascutto <gcp@sjeng.org>
Mon, 16 Jul 2012 18:52:38 +0000 (20:52 +0200)
committerGregory Maxwell <greg@xiph.org>
Mon, 16 Jul 2012 20:45:04 +0000 (16:45 -0400)
Also make the 64-bit builds use the default output directories.
Fix the type of the default Opus output to be a library.

celt/celt.vcxproj
silk/fixed/silk_fixed.vcxproj
silk/float/silk_float.vcxproj
silk/silk_common.vcxproj
src/opus.vcxproj

index 22c6cee..2356d01 100644 (file)
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>\r
-  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
index 55a1ec5..55c76c2 100644 (file)
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <TargetName>$(ProjectName)</TargetName>\r
-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>\r
-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>\r
-  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <TargetName>$(ProjectName)</TargetName>\r
-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>\r
-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>\r
-  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <PrecompiledHeader>\r
index 8882a80..fff1302 100644 (file)
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <TargetName>$(ProjectName)</TargetName>\r
-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>\r
-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>\r
-  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <TargetName>$(ProjectName)</TargetName>\r
-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>\r
-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>\r
-  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <PrecompiledHeader>\r
index 6facd7f..a63b2c3 100644 (file)
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <TargetName>$(ProjectName)</TargetName>\r
-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>\r
-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>\r
-  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <TargetName>$(ProjectName)</TargetName>\r
-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>\r
-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>\r
-  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <PrecompiledHeader>\r
index b914c95..1eeba0b 100644 (file)
@@ -29,7 +29,7 @@
     <UseDebugLibraries>true</UseDebugLibraries>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -38,7 +38,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <LinkIncremental>true</LinkIncremental>\r
-    <TargetName>$(ProjectName)</TargetName>\r
-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>\r
-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
     <LinkIncremental>false</LinkIncremental>\r
-    <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>\r
-    <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r