alex
/
libnyquist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

introduce vs 2015 example solution/proj file and fix paths. vs 2013 needs to be fixed

Browse Source
pull/16/head
Dimitri 10 years ago
parent 5648d7a014
commit 29b7b203f9
11 changed files with 147 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -42,4 +42,6 @@ DerivedData
*.reapeaks *.reapeaks
*.opendb
encoded.wav encoded.wav

0
examples/libnyquist-examples.vcxproj/libnyquist-examples.sln → examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.sln
Unescape Escape View File

0
examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj → examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.vcxproj
Unescape Escape View File

0
examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj.filters → examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.vcxproj.filters
Unescape Escape View File

28
examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.sln
Unescape Escape View File

@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist-examples", "libnyquist-examples.vcxproj", "{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist", "..\..\..\libnyquist.vcxproj\v140\libnyquist.vcxproj", "{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Debug|Win32.ActiveCfg = Debug|Win32
{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Debug|Win32.Build.0 = Debug|Win32
{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Release|Win32.ActiveCfg = Release|Win32
{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Release|Win32.Build.0 = Release|Win32
{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Debug|Win32.ActiveCfg = Debug|Win32
{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Debug|Win32.Build.0 = Debug|Win32
{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|Win32.ActiveCfg = Release|Win32
{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

90
examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj
Unescape Escape View File

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}</ProjectGuid>
<RootNamespace>libnyquistexamples</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)../../../include;$(SolutionDir)../../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__WINDOWS_DS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)../../include;$(SolutionDir)../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__WINDOWS_DS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\third_party\rtaudio\RtAudio.cpp" />
<ClCompile Include="..\..\src\Main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\third_party\rtaudio\RtAudio.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\libnyquist.vcxproj\v140\libnyquist.vcxproj">
<Project>{0eec3739-f60a-4b90-8b75-9e1aff28106a}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

26
examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj.filters
Unescape Escape View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="third_party">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\Main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\third_party\rtaudio\RtAudio.cpp">
<Filter>third_party</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\third_party\rtaudio\RtAudio.h">
<Filter>third_party</Filter>
</ClInclude>
</ItemGroup>
</Project>

2
examples/src/Main.cpp
Unescape Escape View File

@ -1,5 +1,5 @@
// Note to Visual Studio / Windows users: you must set the working directory manually on the project file // Note to Visual Studio / Windows users: you must set the working directory manually on the project file
// to $(ProjectDir)../../ since these settings are not saved directly in project. The loader // to $(ProjectDir)../../../ since these settings are not saved directly in project. The loader
// will be unable to find the example assets unless the proper working directory is set. // will be unable to find the example assets unless the proper working directory is set.
#if defined(_MSC_VER) #if defined(_MSC_VER)

6
libnyquist.vcxproj/v140/libnyquist.vcxproj
Unescape Escape View File

@ -33,8 +33,6 @@
<ClCompile Include="$(ProjectDir)..\..\src\VorbisDependencies.c" /> <ClCompile Include="$(ProjectDir)..\..\src\VorbisDependencies.c" />
<ClCompile Include="$(ProjectDir)..\..\src\WavEncoder.cpp" /> <ClCompile Include="$(ProjectDir)..\..\src\WavEncoder.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\RiffUtils.cpp" /> <ClCompile Include="$(ProjectDir)..\..\src\RiffUtils.cpp" />
<ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_decoder.c" />
<ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_encoder.c" />
<ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\bits.c" /> <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\bits.c" />
<ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra1.c" /> <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra1.c" />
<ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra2.c" /> <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra2.c" />
@ -48,10 +46,6 @@
<ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\wputils.c" /> <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\wputils.c" />
<ClCompile Include="..\..\src\MusepackDecoder.cpp" /> <ClCompile Include="..\..\src\MusepackDecoder.cpp" />
<ClCompile Include="..\..\src\MusepackDependencies.c" /> <ClCompile Include="..\..\src\MusepackDependencies.c" />
<ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_bits_reader.c" />
<ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_decoder.c" />
<ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_demux.c" />
<ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_reader.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h" /> <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h" />

24
libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
Unescape Escape View File

@ -1,12 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_encoder.c">
<Filter>third_party\celt</Filter>
</ClCompile>
<ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_decoder.c">
<Filter>third_party\celt</Filter>
</ClCompile>
<ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\bits.c"> <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\bits.c">
<Filter>third_party\wavpack</Filter> <Filter>third_party\wavpack</Filter>
</ClCompile> </ClCompile>
@ -88,18 +82,6 @@
<ClCompile Include="..\..\src\MusepackDecoder.cpp"> <ClCompile Include="..\..\src\MusepackDecoder.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_bits_reader.c">
<Filter>third_party\mpc</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_decoder.c">
<Filter>third_party\mpc</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_demux.c">
<Filter>third_party\mpc</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_reader.c">
<Filter>third_party\mpc</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h"> <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h">
@ -164,17 +146,11 @@
<Filter Include="third_party\wavpack"> <Filter Include="third_party\wavpack">
<UniqueIdentifier>{d40a1038-d11f-45dc-820b-e32743336269}</UniqueIdentifier> <UniqueIdentifier>{d40a1038-d11f-45dc-820b-e32743336269}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="third_party\celt">
<UniqueIdentifier>{d38860a7-b4e5-4a1e-99a5-c4eac7e1c013}</UniqueIdentifier>
</Filter>
<Filter Include="include\util"> <Filter Include="include\util">
<UniqueIdentifier>{f27e7823-c56c-4e03-af63-2ef0b1e83cbd}</UniqueIdentifier> <UniqueIdentifier>{f27e7823-c56c-4e03-af63-2ef0b1e83cbd}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\deps"> <Filter Include="src\deps">
<UniqueIdentifier>{d839471f-71d1-471e-95e0-c33af9bb64bc}</UniqueIdentifier> <UniqueIdentifier>{d839471f-71d1-471e-95e0-c33af9bb64bc}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="third_party\mpc">
<UniqueIdentifier>{5e7b9ab1-a3bf-4934-96d8-38ad1c4b08d7}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>

7
src/OpusDependencies.c
Unescape Escape View File

@ -92,17 +92,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "opus/celt/rate.c" #include "opus/celt/rate.c"
#include "opus/celt/vq.c" #include "opus/celt/vq.c"
// Disabled inline because of name clash of opus_custom_encoder_get_size.
#include "opus/celt/celt_decoder.c" #include "opus/celt/celt_decoder.c"
#define opus_custom_encoder_get_size opus_custom_encoder_get_size_alt #define opus_custom_encoder_get_size opus_custom_encoder_get_size_alt
#include "opus/celt/celt_encoder.c" #include "opus/celt/celt_encoder.c"
/*
See celt/celt_decoder.c + celt/celt_encoder.c in the project browser.
These files need to be in separate translation units due to name clashes,
unfortunately.
*/
///////////////// /////////////////
// SILK Common // // SILK Common //
///////////////// /////////////////

Write Preview
Loading…
Cancel
Save