diff options
| author | Gian-Carlo Pascutto <gcp@sjeng.org> | 2012-07-16 22:52:38 +0400 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2012-07-17 00:45:04 +0400 |
| commit | 642084c47c0807686db4ae2def61a11dee80a81d (patch) | |
| tree | 6c549b6ac34783ad6fd3e96b383a242feae9d983 /silk | |
| parent | eeb7bd3d9d4569ac556f1fd70434abea571f57f3 (diff) | |
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.
Diffstat (limited to 'silk')
| -rw-r--r-- | silk/fixed/silk_fixed.vcxproj | 12 | ||||
| -rw-r--r-- | silk/float/silk_float.vcxproj | 12 | ||||
| -rw-r--r-- | silk/silk_common.vcxproj | 12 |
3 files changed, 6 insertions, 30 deletions
diff --git a/silk/fixed/silk_fixed.vcxproj b/silk/fixed/silk_fixed.vcxproj index 55a1ec5d..55c76c24 100644 --- 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>
diff --git a/silk/float/silk_float.vcxproj b/silk/float/silk_float.vcxproj index 8882a80f..fff13026 100644 --- 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>
diff --git a/silk/silk_common.vcxproj b/silk/silk_common.vcxproj index 6facd7f2..a63b2c33 100644 --- 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>
|