diff options
| author | Gian-Carlo Pascutto <gcp@sjeng.org> | 2012-07-16 22:40:16 +0400 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2012-07-17 00:45:04 +0400 |
| commit | eeb7bd3d9d4569ac556f1fd70434abea571f57f3 (patch) | |
| tree | e0a9710776412ca68877080b9ecb766274b5ffac /silk | |
| parent | 396c4e5e1edff67ce2a349d4f64107cbe91044cb (diff) | |
Make MSVC build work in parallel.
The (non-default) temporary & output dirs configured in the projects could
cause issues when doing compilation on a multiprocessor machine. Cleaned
this up a little to use the defaults, which makes that work again and
doesn't make the output structure any worse. Also removed debug output for
release binaries & a tiny whitespace fix.
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 69456ddc..55a1ec5d 100644 --- a/silk/fixed/silk_fixed.vcxproj +++ b/silk/fixed/silk_fixed.vcxproj @@ -63,21 +63,13 @@ <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)'=='Debug|Win32'">
- <TargetName>$(ProjectName)</TargetName>
- <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
- <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>
- </PropertyGroup>
+ <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)'=='Release|Win32'">
- <TargetName>$(ProjectName)</TargetName>
- <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
- <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>$(ProjectName)</TargetName>
<OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
diff --git a/silk/float/silk_float.vcxproj b/silk/float/silk_float.vcxproj index 42fc28e6..8882a80f 100644 --- a/silk/float/silk_float.vcxproj +++ b/silk/float/silk_float.vcxproj @@ -63,21 +63,13 @@ <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)'=='Debug|Win32'">
- <TargetName>$(ProjectName)</TargetName>
- <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
- <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>
- </PropertyGroup>
+ <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)'=='Release|Win32'">
- <TargetName>$(ProjectName)</TargetName>
- <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
- <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>$(ProjectName)</TargetName>
<OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
diff --git a/silk/silk_common.vcxproj b/silk/silk_common.vcxproj index 7435e9cd..6facd7f2 100644 --- a/silk/silk_common.vcxproj +++ b/silk/silk_common.vcxproj @@ -63,21 +63,13 @@ <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)'=='Debug|Win32'">
- <TargetName>$(ProjectName)</TargetName>
- <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
- <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>
- </PropertyGroup>
+ <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)'=='Release|Win32'">
- <TargetName>$(ProjectName)</TargetName>
- <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
- <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>$(ProjectName)</TargetName>
<OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
|