Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.xiph.org/xiph/opus.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGian-Carlo Pascutto <gcp@sjeng.org>2012-07-16 22:52:38 +0400
committerGregory Maxwell <greg@xiph.org>2012-07-17 00:45:04 +0400
commit642084c47c0807686db4ae2def61a11dee80a81d (patch)
tree6c549b6ac34783ad6fd3e96b383a242feae9d983
parenteeb7bd3d9d4569ac556f1fd70434abea571f57f3 (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
-rw-r--r--celt/celt.vcxproj16
-rw-r--r--silk/fixed/silk_fixed.vcxproj12
-rw-r--r--silk/float/silk_float.vcxproj12
-rw-r--r--silk/silk_common.vcxproj12
-rw-r--r--src/opus.vcxproj9
5 files changed, 12 insertions, 49 deletions
diff --git a/celt/celt.vcxproj b/celt/celt.vcxproj
index 22c6ceec..2356d017 100644
--- 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'" />
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>
diff --git a/src/opus.vcxproj b/src/opus.vcxproj
index b914c95e..1eeba0b9 100644
--- 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,17 +62,12 @@
</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>
</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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 12:42:02 +0300