fix linkage issues

adpcm
Dimitri Diakopoulos 11 years ago
parent 77b62a44dc
commit 1fd81f0b0a

@ -5,7 +5,7 @@ VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist-examples", "libnyquist-examples.vcxproj", "{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist-examples", "libnyquist-examples.vcxproj", "{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist", "..\..\libnyquist.vcxproj\libnyquist.vcxproj", "{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist", "..\..\libnyquist.vcxproj\v120\libnyquist.vcxproj", "{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

@ -75,7 +75,7 @@
<ClInclude Include="..\..\third_party\rtaudio\RtAudio.h" /> <ClInclude Include="..\..\third_party\rtaudio\RtAudio.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\libnyquist.vcxproj\libnyquist.vcxproj"> <ProjectReference Include="..\..\libnyquist.vcxproj\v120\libnyquist.vcxproj">
<Project>{0eec3739-f60a-4b90-8b75-9e1aff28106a}</Project> <Project>{0eec3739-f60a-4b90-8b75-9e1aff28106a}</Project>
<Private>false</Private> <Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly> <ReferenceOutputAssembly>true</ReferenceOutputAssembly>

@ -48,6 +48,10 @@
<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" />

@ -88,6 +88,18 @@
<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_reader.c">
<Filter>third_party\mpc</Filter>
</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>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h"> <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h">
@ -158,5 +170,8 @@
<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>{cc5d22ad-1a3e-46cf-8f65-7d33f02629fb}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>

@ -48,6 +48,10 @@
<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" />

@ -88,6 +88,18 @@
<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">
@ -158,5 +170,8 @@
<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>
Loading…
Cancel
Save