diff options
author | Jonathan Lennox <jonathan@vidyo.com> | 2015-08-03 17:04:29 -0400 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2015-09-01 17:21:31 -0400 |
commit | a7c1ebf6bc2d2b770eed5c2398a73065ecc7ca4d (patch) | |
tree | 0b25e15d2c53b50e9d39a78415c80638fddd066c | |
parent | fee0ed0754bd08b81629c6a35ce1cf09266fdf8b (diff) | |
download | opus-a7c1ebf6bc2d2b770eed5c2398a73065ecc7ca4d.tar.gz |
Use ProjectReference rather than AdditionalDependencies for test programs, so build dependencies are right.
Actually add source code to opus_demo project, and fix its include paths.
-rw-r--r-- | win32/VS2010/opus_demo.vcxproj | 29 | ||||
-rw-r--r-- | win32/VS2010/opus_demo.vcxproj.filters | 5 | ||||
-rw-r--r-- | win32/VS2010/test_opus_api.vcxproj | 18 | ||||
-rw-r--r-- | win32/VS2010/test_opus_decode.vcxproj | 18 | ||||
-rw-r--r-- | win32/VS2010/test_opus_encode.vcxproj | 18 |
5 files changed, 68 insertions, 20 deletions
diff --git a/win32/VS2010/opus_demo.vcxproj b/win32/VS2010/opus_demo.vcxproj index 9cc081f1..d087147f 100644 --- a/win32/VS2010/opus_demo.vcxproj +++ b/win32/VS2010/opus_demo.vcxproj @@ -18,6 +18,23 @@ <Platform>x64</Platform> </ProjectConfiguration> </ItemGroup> + <ItemGroup> + <ProjectReference Include="celt.vcxproj"> + <Project>{245603e3-f580-41a5-9632-b25fe3372cbf}</Project> + </ProjectReference> + <ProjectReference Include="opus.vcxproj"> + <Project>{219ec965-228a-1824-174d-96449d05f88a}</Project> + </ProjectReference> + <ProjectReference Include="silk_common.vcxproj"> + <Project>{c303d2fc-ff97-49b8-9ddd-467b4c9a0b16}</Project> + </ProjectReference> + <ProjectReference Include="silk_float.vcxproj"> + <Project>{9c4961d2-5ddb-40c7-9be8-ca918dc4e782}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\opus_demo.c" /> + </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{016C739D-6389-43BF-8D88-24B2BF6F620F}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -85,13 +102,12 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../silk;../celt;../win32;../include;</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>$(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -101,13 +117,12 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../silk;../celt;../win32;../include;</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>$(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -120,14 +135,13 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>../silk;../celt;../win32;../include;</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>$(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -140,14 +154,13 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>../silk;../celt;../win32;../include;</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>$(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/win32/VS2010/opus_demo.vcxproj.filters b/win32/VS2010/opus_demo.vcxproj.filters index d7ef6a1a..2eb113ac 100644 --- a/win32/VS2010/opus_demo.vcxproj.filters +++ b/win32/VS2010/opus_demo.vcxproj.filters @@ -14,4 +14,9 @@ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> </Filter> </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\opus_demo.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/win32/VS2010/test_opus_api.vcxproj b/win32/VS2010/test_opus_api.vcxproj index bf42a8fa..0389b958 100644 --- a/win32/VS2010/test_opus_api.vcxproj +++ b/win32/VS2010/test_opus_api.vcxproj @@ -21,6 +21,20 @@ <ItemGroup> <ClCompile Include="..\..\tests\test_opus_api.c" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="celt.vcxproj"> + <Project>{245603e3-f580-41a5-9632-b25fe3372cbf}</Project> + </ProjectReference> + <ProjectReference Include="opus.vcxproj"> + <Project>{219ec965-228a-1824-174d-96449d05f88a}</Project> + </ProjectReference> + <ProjectReference Include="silk_common.vcxproj"> + <Project>{c303d2fc-ff97-49b8-9ddd-467b4c9a0b16}</Project> + </ProjectReference> + <ProjectReference Include="silk_float.vcxproj"> + <Project>{9c4961d2-5ddb-40c7-9be8-ca918dc4e782}</Project> + </ProjectReference> + </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{1D257A17-D254-42E5-82D6-1C87A6EC775A}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -94,7 +108,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -110,7 +123,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -129,7 +141,6 @@ <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -148,7 +159,6 @@ <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/win32/VS2010/test_opus_decode.vcxproj b/win32/VS2010/test_opus_decode.vcxproj index 34523319..67e552d3 100644 --- a/win32/VS2010/test_opus_decode.vcxproj +++ b/win32/VS2010/test_opus_decode.vcxproj @@ -21,6 +21,20 @@ <ItemGroup> <ClCompile Include="..\..\tests\test_opus_decode.c" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="celt.vcxproj"> + <Project>{245603e3-f580-41a5-9632-b25fe3372cbf}</Project> + </ProjectReference> + <ProjectReference Include="opus.vcxproj"> + <Project>{219ec965-228a-1824-174d-96449d05f88a}</Project> + </ProjectReference> + <ProjectReference Include="silk_common.vcxproj"> + <Project>{c303d2fc-ff97-49b8-9ddd-467b4c9a0b16}</Project> + </ProjectReference> + <ProjectReference Include="silk_float.vcxproj"> + <Project>{9c4961d2-5ddb-40c7-9be8-ca918dc4e782}</Project> + </ProjectReference> + </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{8578322A-1883-486B-B6FA-E0094B65C9F2}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -95,7 +109,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -112,7 +125,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -132,7 +144,6 @@ <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -152,7 +163,6 @@ <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/win32/VS2010/test_opus_encode.vcxproj b/win32/VS2010/test_opus_encode.vcxproj index d2ede27e..50354d4f 100644 --- a/win32/VS2010/test_opus_encode.vcxproj +++ b/win32/VS2010/test_opus_encode.vcxproj @@ -21,6 +21,20 @@ <ItemGroup> <ClCompile Include="..\..\tests\test_opus_encode.c" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="celt.vcxproj"> + <Project>{245603e3-f580-41a5-9632-b25fe3372cbf}</Project> + </ProjectReference> + <ProjectReference Include="opus.vcxproj"> + <Project>{219ec965-228a-1824-174d-96449d05f88a}</Project> + </ProjectReference> + <ProjectReference Include="silk_common.vcxproj"> + <Project>{c303d2fc-ff97-49b8-9ddd-467b4c9a0b16}</Project> + </ProjectReference> + <ProjectReference Include="silk_float.vcxproj"> + <Project>{9c4961d2-5ddb-40c7-9be8-ca918dc4e782}</Project> + </ProjectReference> + </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{84DAA768-1A38-4312-BB61-4C78BB59E5B8}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -95,7 +109,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -112,7 +125,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -132,7 +144,6 @@ <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -152,7 +163,6 @@ <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>$(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |