diff options
| author | Gian-Carlo Pascutto <gcp@sjeng.org> | 2012-07-13 12:04:59 +0400 |
|---|---|---|
| committer | Gian-Carlo Pascutto <gcp@sjeng.org> | 2012-07-13 12:04:59 +0400 |
| commit | 619aa8b26812c4dc7b344441ee9f315b2019f15c (patch) | |
| tree | 8d48332b65035f2463524541d0680895d3486a00 /src | |
| parent | c0edd6373768d76a55eded335dab9b119240eff5 (diff) | |
Fix MSVC Debug builds, set missing dependencies for tests.
Diffstat (limited to 'src')
| -rw-r--r-- | src/opus.vcxproj | 3 | ||||
| -rw-r--r-- | src/opus_demo.vcxproj | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/opus.vcxproj b/src/opus.vcxproj index 45f4a576..de4d3ee5 100644 --- a/src/opus.vcxproj +++ b/src/opus.vcxproj @@ -25,7 +25,7 @@ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
+ <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -59,7 +59,6 @@ <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>$(ProjectName)</TargetName>
<OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
<IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>
</PropertyGroup>
diff --git a/src/opus_demo.vcxproj b/src/opus_demo.vcxproj index 31752315..7eb582ee 100644 --- a/src/opus_demo.vcxproj +++ b/src/opus_demo.vcxproj @@ -39,12 +39,12 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> @@ -71,11 +71,13 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>../silk;../celt;../win32;../include;</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\opus.lib;$(SolutionDir)$(Configuration)$(PlatformArchitecture)\celt.lib;$(SolutionDir)$(Configuration)$(PlatformArchitecture)\silk_common.lib;$(SolutionDir)$(Configuration)$(PlatformArchitecture)\silk_float.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |