Merge pull request xbmc#7446 from stefansaraev/sling-cleanup

tsp · Jul 8, 2015 · 92285ec · 92285ec
2 parents 1fb816b + d2c8cac
commit 92285ec
Show file tree

Hide file tree

Showing 27 changed files with 4 additions and 2,661 deletions.
diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj
diff --git a/Makefile.in b/Makefile.in
@@ -27,7 +27,6 @@ DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \
                    xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a
 
 DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
-                   lib/SlingboxLib/SlingboxLib.a \
                    xbmc/addons/addons.a \
                    xbmc/cdrip/cdrip.a \
                    xbmc/contrib/kissfft/kissfft.a \
@@ -415,8 +414,7 @@ libs: $(LIBSSE4) imagelib libexif system/libcpluff-@ARCH@.so
 externals: codecs libs visualizations screensavers libaddon
 
 xcode_depends: \
-	codecs libs visualizations screensavers eventclients skins libaddon \
-	lib/SlingboxLib/SlingboxLib.a
+	codecs libs visualizations screensavers eventclients skins libaddon
 
 DYNOBJSXBMC= \
 	xbmc/linux/linux.a \

diff --git a/lib/SlingboxLib/Makefile b/lib/SlingboxLib/Makefile