aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--project/VS2008Express/XBMC for Windows.sln13
-rw-r--r--xbmc/Application.cpp2
-rw-r--r--xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcproj176
3 files changed, 128 insertions, 63 deletions
diff --git a/project/VS2008Express/XBMC for Windows.sln b/project/VS2008Express/XBMC for Windows.sln
index fbd7567d41..871e00f9c0 100644
--- a/project/VS2008Express/XBMC for Windows.sln
+++ b/project/VS2008Express/XBMC for Windows.sln
@@ -5,6 +5,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XBMC", "XBMC.vcproj", "{3A6
{00700E12-A63B-4E54-B962-4011A90584BD} = {00700E12-A63B-4E54-B962-4011A90584BD}
{B2975495-FBE4-4F94-AAC5-B21A9842BF50} = {B2975495-FBE4-4F94-AAC5-B21A9842BF50}
{76850A99-4EC7-4196-B3EA-E4120A00E8A6} = {76850A99-4EC7-4196-B3EA-E4120A00E8A6}
+ {5013769A-0784-4CE8-9D9D-09AC7F731B4F} = {5013769A-0784-4CE8-9D9D-09AC7F731B4F}
{510441AC-B9E1-4B31-9C0C-EB3AD39D90C4} = {510441AC-B9E1-4B31-9C0C-EB3AD39D90C4}
{FE0A91C0-E30A-47CD-8A92-A508C9292452} = {FE0A91C0-E30A-47CD-8A92-A508C9292452}
{3A575CF0-45B3-41CC-85E2-9F9CE8C56B38} = {3A575CF0-45B3-41CC-85E2-9F9CE8C56B38}
@@ -33,7 +34,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "..\..\xbmc\lib\libm
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\..\lib\freetype\builds\win32\vc2008\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libass_win32", "..\..\xbmc\lib\libass\libass_win32\libass_win32_vs2008.vcproj", "{BA5B08FC-2ECB-4571-9F25-F8054522FC65}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libass_dll", "..\..\xbmc\lib\libass\libass_win32\libass_win32_vs2008.vcproj", "{BA5B08FC-2ECB-4571-9F25-F8054522FC65}"
ProjectSection(ProjectDependencies) = postProject
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
EndProjectSection
@@ -46,6 +47,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcmyth_dll", "..\..\xbmc\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "..\..\xbmc\lib\libshout\libshout\libshout.vcproj", "{76850A99-4EC7-4196-B3EA-E4120A00E8A6}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "..\..\xbmc\lib\libsamplerate\libsamplerate_win32\libsamplerate_win32.vcproj", "{5013769A-0784-4CE8-9D9D-09AC7F731B4F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug (DirectX)|Win32 = Debug (DirectX)|Win32
@@ -156,6 +159,14 @@ Global
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (DirectX)|Win32.Build.0 = Release|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (OpenGL)|Win32.Build.0 = Release|Win32
+ {5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32
+ {5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Debug (DirectX)|Win32.Build.0 = Debug|Win32
+ {5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32
+ {5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32
+ {5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Release (DirectX)|Win32.ActiveCfg = Release|Win32
+ {5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Release (DirectX)|Win32.Build.0 = Release|Win32
+ {5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32
+ {5013769A-0784-4CE8-9D9D-09AC7F731B4F}.Release (OpenGL)|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index df76fac2cc..a5a9cf57fc 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -290,7 +290,6 @@ using namespace DBUSSERVER;
#pragma comment (lib,"../../xbmc/lib/libiconv/libiconvd.lib")
#pragma comment (lib,"../../xbmc/lib/libfribidi/libfribidid.lib")
#pragma comment (lib,"../../xbmc/lib/libpcre/libpcred.lib")
- #pragma comment (lib,"../../xbmc/lib/libsamplerate/libsamplerate_win32d.lib")
#else
#ifdef HAS_FILESYSTEM
#pragma comment (lib,"../../xbmc/lib/libXBMS/libXBMS.lib")
@@ -303,7 +302,6 @@ using namespace DBUSSERVER;
#pragma comment (lib,"../../xbmc/lib/libiconv/libiconv.lib")
#pragma comment (lib,"../../xbmc/lib/libfribidi/libfribidi.lib")
#pragma comment (lib,"../../xbmc/lib/libpcre/libpcre.lib")
- #pragma comment (lib,"../../xbmc/lib/libsamplerate/libsamplerate_win32.lib")
#endif
#endif
diff --git a/xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcproj b/xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcproj
index bd014f0c5b..c7df7f7ff8 100644
--- a/xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcproj
+++ b/xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcproj
@@ -1,63 +1,109 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
- Name="libsamplerate_win32"
+ Version="9,00"
+ Name="libsamplerate"
ProjectGUID="{5013769A-0784-4CE8-9D9D-09AC7F731B4F}"
- Keyword="Win32Proj">
+ RootNamespace="libsamplerate"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\Win32"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- MinimalRebuild="TRUE"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="5"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/libsamplerate_win32d.lib"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/libsamplerate_win32d.lib"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Win32"
@@ -65,32 +111,38 @@
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
- CompileAs="1"/>
- <Tool
- Name="VCCustomBuildTool"/>
+ CompileAs="1"
+ />
<Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/libsamplerate_win32.lib"/>
- <Tool
- Name="VCMIDLTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/libsamplerate_win32.lib"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -99,51 +151,55 @@
<Filter
Name="Quelldateien"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath="..\src\samplerate.c">
+ RelativePath="..\src\samplerate.c"
+ >
</File>
<File
- RelativePath="..\src\src_linear.c">
+ RelativePath="..\src\src_linear.c"
+ >
</File>
<File
- RelativePath="..\src\src_sinc.c">
+ RelativePath="..\src\src_sinc.c"
+ >
</File>
<File
- RelativePath="..\src\src_zoh.c">
+ RelativePath="..\src\src_zoh.c"
+ >
</File>
</Filter>
<Filter
Name="Headerdateien"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath="..\src\common.h">
+ RelativePath="..\src\common.h"
+ >
</File>
<File
- RelativePath="..\src\fastest_coeffs.h">
+ RelativePath="..\src\fastest_coeffs.h"
+ >
</File>
<File
- RelativePath="..\src\float_cast.h">
+ RelativePath="..\src\float_cast.h"
+ >
</File>
<File
- RelativePath="..\src\high_qual_coeffs.h">
+ RelativePath="..\src\high_qual_coeffs.h"
+ >
</File>
<File
- RelativePath="..\src\mid_qual_coeffs.h">
+ RelativePath="..\src\mid_qual_coeffs.h"
+ >
</File>
<File
- RelativePath="..\src\samplerate.h">
+ RelativePath="..\src\samplerate.h"
+ >
</File>
</Filter>
- <Filter
- Name="Ressourcendateien"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- </Filter>
- <File
- RelativePath=".\ReadMe.txt">
- </File>
</Files>
<Globals>
</Globals>
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-25 11:01:28 +0000