Skip to content

Commit

Permalink
changed: ditch libshout and replace with curl-based code
Browse files Browse the repository at this point in the history
Fixed up Backport of r35468.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35487 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information
theuni committed Nov 27, 2010
1 parent 39454ed commit b3b440a
Show file tree
Hide file tree
Showing 17 changed files with 64 additions and 1,078 deletions.
5 changes: 0 additions & 5 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ BIN_DIRS= \
xbmc/lib/libPython/xbmcmodule \
xbmc/lib/libRTV \
xbmc/lib/libscrobbler \
xbmc/lib/libshout \
xbmc/lib/libUPnP \
xbmc/lib/libXBMS \
xbmc/lib/libXDAAP \
Expand Down Expand Up @@ -242,8 +241,6 @@ xbmc/lib/libscrobbler/scrobbler.a: force
$(MAKE) -C xbmc/lib/libscrobbler
xbmc/lib/libRTV/librtv-@ARCH@.a: force
$(MAKE) -C xbmc/lib/libRTV
xbmc/lib/libshout/libshout-@ARCH@.a: force
$(MAKE) -C xbmc/lib/libshout
xbmc/lib/libUPnP/libupnp-@ARCH@.a: force
$(MAKE) -C xbmc/lib/libUPnP
xbmc/lib/libXBMS/libxbms-@ARCH@.a: force
Expand Down Expand Up @@ -389,7 +386,6 @@ xcode_depends: \
xbmc/lib/libXBMS/libxbms-@ARCH@.a \
xbmc/lib/libRTV/librtv-@ARCH@.a \
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
xbmc/lib/libshout/libshout-@ARCH@.a \
xbmc/lib/libjsonrpc/libjsonrpc.a \
xbmc/lib/libhttpapi/libhttpapi.a \
lib/jsoncpp/jsoncpp/src/lib_json/libjsoncpp.a \
Expand Down Expand Up @@ -427,7 +423,6 @@ OBJSXBMC= \
xbmc/lib/libPython/xbmcmodule/xbmcmodule.a \
xbmc/lib/libscrobbler/scrobbler.a \
xbmc/lib/libRTV/librtv-@ARCH@.a \
xbmc/lib/libshout/libshout-@ARCH@.a \
xbmc/lib/libUPnP/libupnp-@ARCH@.a \
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
xbmc/lib/libjsonrpc/libjsonrpc.a \
Expand Down
24 changes: 0 additions & 24 deletions XBMC.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@
810C9F630D67BD2F0095F5DD /* PltMediaConnect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9F600D67BD2F0095F5DD /* PltMediaConnect.cpp */; };
810C9FA90D67D1FB0095F5DD /* MythDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9FA50D67D1FB0095F5DD /* MythDirectory.cpp */; };
810C9FAA0D67D1FB0095F5DD /* MythFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9FA70D67D1FB0095F5DD /* MythFile.cpp */; };
810CA01C0D68A6E20095F5DD /* libshout-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E30B3E8E0D5D59290030A311 /* libshout-x86-osx.a */; };
815EE6350E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 815EE6330E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp */; };
83A72B910FBC8DB000171871 /* CoreAudioRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A72B8E0FBC8DB000171871 /* CoreAudioRenderer.cpp */; };
83A72B940FBC8DFF00171871 /* CoreAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A72B920FBC8DFF00171871 /* CoreAudio.cpp */; };
Expand Down Expand Up @@ -563,7 +562,6 @@
E38E20520D25F9FD00618676 /* RarDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17460D25F9FA00618676 /* RarDirectory.cpp */; };
E38E20530D25F9FD00618676 /* RarManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17480D25F9FA00618676 /* RarManager.cpp */; };
E38E20540D25F9FD00618676 /* RTVDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174B0D25F9FA00618676 /* RTVDirectory.cpp */; };
E38E20560D25F9FD00618676 /* ShoutcastRipFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174F0D25F9FA00618676 /* ShoutcastRipFile.cpp */; };
E38E20570D25F9FD00618676 /* SIDFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */; };
E38E20580D25F9FD00618676 /* SmartPlaylistDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */; };
E38E205B0D25F9FD00618676 /* StackDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17590D25F9FA00618676 /* StackDirectory.cpp */; };
Expand Down Expand Up @@ -1274,7 +1272,6 @@
F5A1C9840F6B06CF00A96ABD /* RarDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17460D25F9FA00618676 /* RarDirectory.cpp */; };
F5A1C9850F6B06CF00A96ABD /* RarManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17480D25F9FA00618676 /* RarManager.cpp */; };
F5A1C9860F6B06CF00A96ABD /* RTVDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174B0D25F9FA00618676 /* RTVDirectory.cpp */; };
F5A1C9880F6B06CF00A96ABD /* ShoutcastRipFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174F0D25F9FA00618676 /* ShoutcastRipFile.cpp */; };
F5A1C9890F6B06CF00A96ABD /* SIDFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */; };
F5A1C98A0F6B06CF00A96ABD /* SmartPlaylistDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */; };
F5A1C98B0F6B06CF00A96ABD /* StackDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17590D25F9FA00618676 /* StackDirectory.cpp */; };
Expand Down Expand Up @@ -2208,7 +2205,6 @@
C85EB761117461830008E5A5 /* GUIViewStateAddonBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewStateAddonBrowser.h; sourceTree = "<group>"; };
E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCHelper.cpp; sourceTree = "<group>"; };
E306D12D0DDF7B590052C2AD /* XBMCHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCHelper.h; sourceTree = "<group>"; };
E30B3E8E0D5D59290030A311 /* libshout-x86-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libshout-x86-osx.a"; path = "xbmc/lib/libshout/libshout-x86-osx.a"; sourceTree = "<group>"; };
E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxVobsub.cpp; sourceTree = "<group>"; };
E33466A50D2E5103005A65EC /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
E33979940D62FD47004ECDDA /* DVDInputStreamTV.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDInputStreamTV.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2795,8 +2791,6 @@
E38E17490D25F9FA00618676 /* RarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RarManager.h; sourceTree = "<group>"; };
E38E174B0D25F9FA00618676 /* RTVDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTVDirectory.cpp; sourceTree = "<group>"; };
E38E174C0D25F9FA00618676 /* RTVDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTVDirectory.h; sourceTree = "<group>"; };
E38E174F0D25F9FA00618676 /* ShoutcastRipFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShoutcastRipFile.cpp; sourceTree = "<group>"; };
E38E17500D25F9FA00618676 /* ShoutcastRipFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoutcastRipFile.h; sourceTree = "<group>"; };
E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SIDFileDirectory.cpp; sourceTree = "<group>"; };
E38E17520D25F9FA00618676 /* SIDFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SIDFileDirectory.h; sourceTree = "<group>"; };
E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartPlaylistDirectory.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3071,8 +3065,6 @@
E38E1A220D25F9FB00618676 /* errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = errors.h; sourceTree = "<group>"; };
E38E1A250D25F9FB00618676 /* scrobbler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scrobbler.cpp; sourceTree = "<group>"; };
E38E1A260D25F9FB00618676 /* scrobbler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scrobbler.h; sourceTree = "<group>"; };
E38E1A280D25F9FB00618676 /* filelib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filelib.h; sourceTree = "<group>"; };
E38E1A2D0D25F9FB00618676 /* rip_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rip_manager.h; sourceTree = "<group>"; };
E38E1AB80D25F9FB00618676 /* SConstruct */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SConstruct; sourceTree = "<group>"; };
E38E1ABD0D25F9FB00618676 /* MediaCrawler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaCrawler.cpp; sourceTree = "<group>"; };
E38E1ABE0D25F9FB00618676 /* MediaCrawler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaCrawler.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3860,7 +3852,6 @@
E35EF2550D380C3D00DB5CD5 /* QuickTime.framework in Frameworks */,
E35EF3240D380E1E00DB5CD5 /* Carbon.framework in Frameworks */,
E3EB8F080D5D5C0300FFF489 /* libvorbis.dylib in Frameworks */,
810CA01C0D68A6E20095F5DD /* libshout-x86-osx.a in Frameworks */,
E3BBB7A20D7EA8B200CAAFD3 /* libpcre.dylib in Frameworks */,
88ECB6590DE013C4003396A7 /* DiskArbitration.framework in Frameworks */,
88ECB6E70DE07BA6003396A7 /* libfontconfig.1.dylib in Frameworks */,
Expand Down Expand Up @@ -5587,8 +5578,6 @@
E4DC97520FFE5BA8008E0C07 /* SAPFile.cpp */,
F5A7B37C113AFB900059D6AA /* SFTPDirectory.cpp */,
F5A7B37D113AFB900059D6AA /* SFTPDirectory.h */,
E38E174F0D25F9FA00618676 /* ShoutcastRipFile.cpp */,
E38E17500D25F9FA00618676 /* ShoutcastRipFile.h */,
E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */,
E38E17520D25F9FA00618676 /* SIDFileDirectory.h */,
E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */,
Expand Down Expand Up @@ -5740,7 +5729,6 @@
E38E19820D25F9FB00618676 /* libPython */,
E38E1A130D25F9FB00618676 /* libRTV */,
E38E1A210D25F9FB00618676 /* libscrobbler */,
E38E1A270D25F9FB00618676 /* libshout */,
F5E55E601076B34F006E788A /* libsquish */,
E38E1A550D25F9FB00618676 /* libUPnP */,
E38E1C780D25F9FC00618676 /* libXBMS */,
Expand Down Expand Up @@ -5907,15 +5895,6 @@
path = libscrobbler;
sourceTree = "<group>";
};
E38E1A270D25F9FB00618676 /* libshout */ = {
isa = PBXGroup;
children = (
E38E1A280D25F9FB00618676 /* filelib.h */,
E38E1A2D0D25F9FB00618676 /* rip_manager.h */,
);
path = libshout;
sourceTree = "<group>";
};
E38E1A550D25F9FB00618676 /* libUPnP */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -6937,7 +6916,6 @@
E38E256C0D263A1C00618676 /* librtv-x86-osx.a */,
F5DC8816110A4B8900EE1B15 /* libxbms-x86-osx.a */,
E38E25680D2639F100618676 /* libxdaap-x86-osx.a */,
E30B3E8E0D5D59290030A311 /* libshout-x86-osx.a */,
810CA0050D683DEF0095F5DD /* libSDL-x86-osx.a */,
810CA0080D683DEF0095F5DD /* libSDL_mixer-x86-osx.a */,
);
Expand Down Expand Up @@ -7467,7 +7445,6 @@
E38E20520D25F9FD00618676 /* RarDirectory.cpp in Sources */,
E38E20530D25F9FD00618676 /* RarManager.cpp in Sources */,
E38E20540D25F9FD00618676 /* RTVDirectory.cpp in Sources */,
E38E20560D25F9FD00618676 /* ShoutcastRipFile.cpp in Sources */,
E38E20570D25F9FD00618676 /* SIDFileDirectory.cpp in Sources */,
E38E20580D25F9FD00618676 /* SmartPlaylistDirectory.cpp in Sources */,
E38E205B0D25F9FD00618676 /* StackDirectory.cpp in Sources */,
Expand Down Expand Up @@ -8335,7 +8312,6 @@
F5A1C9840F6B06CF00A96ABD /* RarDirectory.cpp in Sources */,
F5A1C9850F6B06CF00A96ABD /* RarManager.cpp in Sources */,
F5A1C9860F6B06CF00A96ABD /* RTVDirectory.cpp in Sources */,
F5A1C9880F6B06CF00A96ABD /* ShoutcastRipFile.cpp in Sources */,
F5A1C9890F6B06CF00A96ABD /* SIDFileDirectory.cpp in Sources */,
F5A1C98A0F6B06CF00A96ABD /* SmartPlaylistDirectory.cpp in Sources */,
F5A1C98B0F6B06CF00A96ABD /* StackDirectory.cpp in Sources */,
Expand Down
1 change: 0 additions & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,6 @@ OUTPUT_FILES="Makefile \
xbmc/lib/libhttpapi/Makefile \
lib/jsoncpp/jsoncpp/src/lib_json/Makefile \
xbmc/lib/libjsonrpc/Makefile \
xbmc/lib/libshout/Makefile \
xbmc/lib/libsquish/Makefile \
xbmc/lib/libid3tag/Makefile \
xbmc/lib/cximage-6.0/Makefile \
Expand Down
11 changes: 0 additions & 11 deletions project/VS2008Express/XBMC for Windows.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XBMC", "XBMC.vcproj", "{3A6
{7A74ED4B-2BF5-47D7-B43E-C80F714417FB} = {7A74ED4B-2BF5-47D7-B43E-C80F714417FB}
{E465056A-C6F3-45EE-B791-CAF8E0CE629D} = {E465056A-C6F3-45EE-B791-CAF8E0CE629D}
{B2975495-FBE4-4F94-AAC5-B21A9842BF50} = {B2975495-FBE4-4F94-AAC5-B21A9842BF50}
{76850A99-4EC7-4196-B3EA-E4120A00E8A6} = {76850A99-4EC7-4196-B3EA-E4120A00E8A6}
{BDD2CB99-93C5-4A70-ACBF-396FFB961AD3} = {BDD2CB99-93C5-4A70-ACBF-396FFB961AD3}
{5013769A-0784-4CE8-9D9D-09AC7F731B4F} = {5013769A-0784-4CE8-9D9D-09AC7F731B4F}
{510441AC-B9E1-4B31-9C0C-EB3AD39D90C4} = {510441AC-B9E1-4B31-9C0C-EB3AD39D90C4}
Expand Down Expand Up @@ -50,8 +49,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad2_dll", "..\..\xbmc\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcmyth_dll", "..\..\xbmc\lib\cmyth\Win32\libcmyth.vcproj", "{F9E6874D-60A8-49BA-9393-A2105E63ABCF}"
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
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsqlite", "..\..\xbmc\lib\sqLite\sqlite\libsqlite_win32\libsqlite_win32.vcproj", "{9E74DF3B-9343-4689-B0EC-4451617F9489}"
Expand Down Expand Up @@ -290,14 +287,6 @@ Global
{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (DirectX)|Win32.Build.0 = Release|Win32
{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32
{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (OpenGL)|Win32.Build.0 = Release|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (DirectX)|Win32.Build.0 = Debug|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (DirectX)|Win32.ActiveCfg = Release|Win32
{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
Expand Down
8 changes: 0 additions & 8 deletions project/VS2008Express/XBMC.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -4267,10 +4267,6 @@
RelativePath="..\..\xbmc\FileSystem\SFTPDirectory.h"
>
</File>
<File
RelativePath="..\..\xbmc\FileSystem\ShoutcastRipFile.cpp"
>
</File>
<File
RelativePath="..\..\xbmc\FileSystem\SIDFileDirectory.cpp"
>
Expand Down Expand Up @@ -5908,10 +5904,6 @@
RelativePath="..\..\xbmc\Shortcut.h"
>
</File>
<File
RelativePath="..\..\xbmc\FileSystem\ShoutcastRipFile.h"
>
</File>
<File
RelativePath="..\..\xbmc\utils\SingleLock.h"
>
Expand Down
10 changes: 0 additions & 10 deletions project/VS2010Express/XBMC for Windows.sln
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad2_dll", "..\..\xbmc\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcmyth_dll", "..\..\xbmc\lib\cmyth\Win32\libcmyth.vcxproj", "{F9E6874D-60A8-49BA-9393-A2105E63ABCF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "..\..\xbmc\lib\libshout\libshout\libshout.vcxproj", "{76850A99-4EC7-4196-B3EA-E4120A00E8A6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "..\..\xbmc\lib\libsamplerate\libsamplerate_win32\libsamplerate_win32.vcxproj", "{5013769A-0784-4CE8-9D9D-09AC7F731B4F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsqlite", "..\..\xbmc\lib\sqLite\sqlite\libsqlite_win32\libsqlite_win32.vcxproj", "{9E74DF3B-9343-4689-B0EC-4451617F9489}"
Expand Down Expand Up @@ -227,14 +225,6 @@ Global
{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (DirectX)|Win32.Build.0 = Release|Win32
{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32
{F9E6874D-60A8-49BA-9393-A2105E63ABCF}.Release (OpenGL)|Win32.Build.0 = Release|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (DirectX)|Win32.Build.0 = Debug|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32
{76850A99-4EC7-4196-B3EA-E4120A00E8A6}.Release (DirectX)|Win32.ActiveCfg = Release|Win32
{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
Expand Down
6 changes: 0 additions & 6 deletions project/VS2010Express/XBMC.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,6 @@
<ClCompile Include="..\..\xbmc\FileSystem\SAPDirectory.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\SAPFile.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\SFTPDirectory.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\ShoutcastRipFile.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\SIDFileDirectory.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\SmartPlaylistDirectory.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\SpecialProtocol.cpp" />
Expand Down Expand Up @@ -1612,7 +1611,6 @@
<ClInclude Include="..\..\xbmc\SettingsControls.h" />
<ClInclude Include="..\..\xbmc\utils\SharedSection.h" />
<ClInclude Include="..\..\xbmc\Shortcut.h" />
<ClInclude Include="..\..\xbmc\FileSystem\ShoutcastRipFile.h" />
<ClInclude Include="..\..\xbmc\utils\SingleLock.h" />
<ClInclude Include="..\..\xbmc\Song.h" />
<ClInclude Include="..\..\xbmc\SortFileItem.h" />
Expand Down Expand Up @@ -1819,10 +1817,6 @@
<Project>{5013769a-0784-4ce8-9d9d-09ac7f731b4f}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\xbmc\lib\libshout\libshout\libshout.vcxproj">
<Project>{76850a99-4ec7-4196-b3ea-e4120a00e8a6}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\xbmc\lib\libsquish\vs7\squish\squish_2010.vcxproj">
<Project>{6a8518c3-d81a-4428-bd7f-c37933088ac1}</Project>
<Private>true</Private>
Expand Down
6 changes: 0 additions & 6 deletions project/VS2010Express/XBMC.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -1572,9 +1572,6 @@
<ClCompile Include="..\..\xbmc\FileSystem\SFTPDirectory.cpp">
<Filter>Source Files\Filesystem</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\FileSystem\ShoutcastRipFile.cpp">
<Filter>Source Files\Filesystem</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\FileSystem\SIDFileDirectory.cpp">
<Filter>Source Files\Filesystem</Filter>
</ClCompile>
Expand Down Expand Up @@ -3942,9 +3939,6 @@
<ClInclude Include="..\..\xbmc\Shortcut.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\FileSystem\ShoutcastRipFile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\utils\SingleLock.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down
Loading

0 comments on commit b3b440a

Please sign in to comment.