Permalink
Browse files

changed: make xbms filesystem excluded if we don't allow nonfree file…

…systems

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27085 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information...
1 parent 011404d commit ff17c8f31efd3e3dd279fd8b1e6438911c506720 elupus committed Jan 22, 2010
Showing with 9 additions and 9 deletions.
  1. +1 −1 Makefile.in
  2. +2 −3 xbmc/FileSystem/FactoryDirectory.cpp
  3. +2 −2 xbmc/FileSystem/FileFactory.cpp
  4. +4 −3 xbmc/FileSystem/Makefile.in
View
@@ -384,7 +384,6 @@ OBJSXBMC= \
xbmc/lib/libRTV/librtv-@ARCH@.a \
xbmc/lib/libshout/libshout-@ARCH@.a \
xbmc/lib/libUPnP/libupnp-@ARCH@.a \
- xbmc/lib/libXBMS/libxbms-@ARCH@.a \
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a \
xbmc/lib/sqLite/sqllite.a \
@@ -397,6 +396,7 @@ OBJSXBMC= \
ifeq (@HAVE_XBMC_NONFREE@,1)
OBJSXBMC+= \
+ xbmc/lib/libXBMS/libxbms-@ARCH@.a \
xbmc/lib/UnrarXLib/UnrarXLib.a
endif
@@ -48,7 +48,7 @@
#include "SMBDirectory.h"
#endif
#endif
-#ifdef HAS_CCXSTREAM
+#if defined(HAS_CCXSTREAM) && defined(HAVE_XBMC_NONFREE)
#include "XBMSDirectory.h"
#endif
#ifdef HAS_FILESYSTEM_CDDA
@@ -57,7 +57,6 @@
#include "PluginDirectory.h"
#ifdef HAS_FILESYSTEM
#include "ISO9660Directory.h"
-#include "XBMSDirectory.h"
#ifdef HAS_FILESYSTEM_RTV
#include "RTVDirectory.h"
#endif
@@ -150,7 +149,7 @@ IDirectory* CFactoryDirectory::Create(const CStdString& strPath)
if (strProtocol == "smb") return new CSMBDirectory();
#endif
#endif
-#ifdef HAS_CCXSTREAM
+#if defined(HAS_CCXSTREAM) && defined(HAVE_XBMC_NONFREE)
if (strProtocol == "xbms") return new CXBMSDirectory();
#endif
#ifdef HAS_FILESYSTEM
@@ -37,7 +37,7 @@
#include "FileSmb.h"
#endif
#endif
-#ifdef HAS_CCXSTREAM
+#if defined(HAS_CCXSTREAM) && defined(HAVE_XBMC_NONFREE)
#include "FileXBMSP.h"
#endif
#ifdef HAS_FILESYSTEM_CDDA
@@ -131,7 +131,7 @@ IFile* CFileFactory::CreateLoader(const CURL& url)
else if (strProtocol == "smb") return new CFileSMB();
#endif
#endif
-#ifdef HAS_CCXSTREAM
+#if defined(HAS_CCXSTREAM) && defined(HAVE_XBMC_NONFREE)
else if (strProtocol == "xbms") return new CFileXBMSP();
#endif
#ifdef HAS_FILESYSTEM
@@ -42,7 +42,6 @@ SRCS=ASAPFileDirectory.cpp \
FileSpecialProtocol.cpp \
FileSmb.cpp \
FileTuxBox.cpp \
- FileXBMSP.cpp \
FileZip.cpp \
FTPDirectory.cpp \
FTPParse.cpp \
@@ -86,15 +85,17 @@ SRCS=ASAPFileDirectory.cpp \
VTPDirectory.cpp \
VTPSession.cpp \
VTPFile.cpp \
- XBMSDirectory.cpp \
ZeroconfDirectory.cpp \
ZipDirectory.cpp \
ZipManager.cpp
ifeq (@HAVE_XBMC_NONFREE@,1)
SRCS+=RarDirectory.cpp \
RarManager.cpp \
- FileRar.cpp
+ FileRar.cpp \
+ XBMSDirectory.cpp \
+ FileXBMSP.cpp \
+
endif
INCLUDES+=-I../lib/libUPnP/Platinum/Source/Core \

0 comments on commit ff17c8f

Please sign in to comment.