From 80e6562d9a5f786e5f4679a56cbf85716c7ae34e Mon Sep 17 00:00:00 2001 From: Memphiz Date: Mon, 22 Aug 2011 20:55:48 +0200 Subject: [PATCH] [sync] - sync buildsys/projects for linux,osx,ios for airplay support --- README.linux | 4 +++- README.ubuntu | 2 +- XBMC-ATV2.xcodeproj/project.pbxproj | 12 ++++++++++++ XBMC-IOS.xcodeproj/project.pbxproj | 12 ++++++++++++ XBMC.xcodeproj/project.pbxproj | 16 ++++++++++++++++ configure.in | 1 + xbmc/DllPaths_generated.h.in | 1 + xbmc/network/Makefile.in | 3 ++- xbmc/system.h | 2 ++ xbmc/utils/Makefile | 1 + 10 files changed, 51 insertions(+), 3 deletions(-) diff --git a/README.linux b/README.linux index 8daa2b588b787..8d4c6ca1d109a 100644 --- a/README.linux +++ b/README.linux @@ -1,3 +1,4 @@ + TOC 1. Introduction 2. Getting the source code @@ -53,7 +54,8 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev, libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev, - libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev + libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev, + libplist-dev *** For developers and anyone else who compiles frequently it is recommended to use ccache diff --git a/README.ubuntu b/README.ubuntu index 0552a148f7f10..92af2e7dcb5d0 100644 --- a/README.ubuntu +++ b/README.ubuntu @@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages: For Ubuntu (all versions >= 7.04): - # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev + # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev For Ubuntu Maverick (10.10): # sudo apt-get install autopoint diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj index 54b01c053421c..f9fa374bf3f6f 100644 --- a/XBMC-ATV2.xcodeproj/project.pbxproj +++ b/XBMC-ATV2.xcodeproj/project.pbxproj @@ -30,6 +30,8 @@ DF0DF16C13A3AF82008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16813A3AF82008ED511 /* FileNFS.cpp */; }; DF0DF16D13A3AF82008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */; }; DF34890913FD96390026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF34890713FD96390026A711 /* GUIAction.cpp */; }; + DFA6BE8713FED2A10048CC11 /* AirPlayServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE8513FED2A10048CC11 /* AirPlayServer.cpp */; }; + DFA6BE8A13FED2B40048CC11 /* HttpParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE8813FED2B40048CC11 /* HttpParser.cpp */; }; DFAB04C113F8385F00B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB04BF13F8385F00B70BFB /* InertialScrollingHandler.cpp */; }; DFD4D22013D7286E00A47C47 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D21413D7286E00A47C47 /* Implementation.cpp */; }; DFD4D22113D7286E00A47C47 /* README.platform in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D21613D7286E00A47C47 /* README.platform */; }; @@ -974,6 +976,10 @@ DF0DF16B13A3AF82008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = ""; }; DF34890713FD96390026A711 /* GUIAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIAction.cpp; sourceTree = ""; }; DF34890813FD96390026A711 /* GUIAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIAction.h; sourceTree = ""; }; + DFA6BE8513FED2A10048CC11 /* AirPlayServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirPlayServer.cpp; sourceTree = ""; }; + DFA6BE8613FED2A10048CC11 /* AirPlayServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirPlayServer.h; sourceTree = ""; }; + DFA6BE8813FED2B40048CC11 /* HttpParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpParser.cpp; sourceTree = ""; }; + DFA6BE8913FED2B40048CC11 /* HttpParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpParser.h; sourceTree = ""; }; DFAB04BF13F8385F00B70BFB /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = ""; }; DFAB04C013F8385F00B70BFB /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = ""; }; DFD4D20D13D7286E00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = ""; }; @@ -4772,6 +4778,8 @@ F56C7648131EC153000AD0F6 /* libscrobbler */, F56C7650131EC153000AD0F6 /* linux */, F56C7653131EC153000AD0F6 /* osx */, + DFA6BE8513FED2A10048CC11 /* AirPlayServer.cpp */, + DFA6BE8613FED2A10048CC11 /* AirPlayServer.h */, F56C7658131EC153000AD0F6 /* DNSNameCache.cpp */, F56C7659131EC153000AD0F6 /* DNSNameCache.h */, F56C765A131EC153000AD0F6 /* EventClient.cpp */, @@ -5106,6 +5114,8 @@ F56C773E131EC154000AD0F6 /* HTMLUtil.h */, F56C773F131EC154000AD0F6 /* HttpHeader.cpp */, F56C7740131EC154000AD0F6 /* HttpHeader.h */, + DFA6BE8813FED2B40048CC11 /* HttpParser.cpp */, + DFA6BE8913FED2B40048CC11 /* HttpParser.h */, F56C7741131EC154000AD0F6 /* InfoLoader.cpp */, F56C7742131EC154000AD0F6 /* InfoLoader.h */, F56C7743131EC154000AD0F6 /* LabelFormatter.cpp */, @@ -6768,6 +6778,8 @@ F5E6209F13E9081400D5F2CD /* InfoBool.cpp in Sources */, DFAB04C113F8385F00B70BFB /* InertialScrollingHandler.cpp in Sources */, DF34890913FD96390026A711 /* GUIAction.cpp in Sources */, + DFA6BE8713FED2A10048CC11 /* AirPlayServer.cpp in Sources */, + DFA6BE8A13FED2B40048CC11 /* HttpParser.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj index a1a08b167c0b6..e534d057a13f6 100644 --- a/XBMC-IOS.xcodeproj/project.pbxproj +++ b/XBMC-IOS.xcodeproj/project.pbxproj @@ -31,6 +31,8 @@ DF0DF17F13A3AF9F008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF17B13A3AF9F008ED511 /* FileNFS.cpp */; }; DF0DF18013A3AF9F008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */; }; DF3488F813FD961A0026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF3488F613FD961A0026A711 /* GUIAction.cpp */; }; + DFA6BE4313FECA010048CC11 /* AirPlayServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE4113FECA010048CC11 /* AirPlayServer.cpp */; }; + DFA6BE7713FED09C0048CC11 /* HttpParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE7513FED09C0048CC11 /* HttpParser.cpp */; }; DFAB04B013F8383300B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB04AE13F8383300B70BFB /* InertialScrollingHandler.cpp */; }; DFD4D1E213D725ED00A47C47 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D1D813D725ED00A47C47 /* Implementation.cpp */; }; DFD4D1E713D7263000A47C47 /* README.platform in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D1E613D7263000A47C47 /* README.platform */; }; @@ -974,6 +976,10 @@ DF0DF17E13A3AF9F008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = ""; }; DF3488F613FD961A0026A711 /* GUIAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIAction.cpp; sourceTree = ""; }; DF3488F713FD961A0026A711 /* GUIAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIAction.h; sourceTree = ""; }; + DFA6BE4113FECA010048CC11 /* AirPlayServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirPlayServer.cpp; sourceTree = ""; }; + DFA6BE4213FECA010048CC11 /* AirPlayServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirPlayServer.h; sourceTree = ""; }; + DFA6BE7513FED09C0048CC11 /* HttpParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpParser.cpp; sourceTree = ""; }; + DFA6BE7613FED09C0048CC11 /* HttpParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpParser.h; sourceTree = ""; }; DFAB04AE13F8383300B70BFB /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = ""; }; DFAB04AF13F8383300B70BFB /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = ""; }; DFD4D1D113D725ED00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = ""; }; @@ -5129,6 +5135,8 @@ F56C862B131F42EA000AD0F6 /* libscrobbler */, F56C8633131F42EA000AD0F6 /* linux */, F56C8636131F42EA000AD0F6 /* osx */, + DFA6BE4113FECA010048CC11 /* AirPlayServer.cpp */, + DFA6BE4213FECA010048CC11 /* AirPlayServer.h */, F56C863B131F42EA000AD0F6 /* DNSNameCache.cpp */, F56C863C131F42EA000AD0F6 /* DNSNameCache.h */, F56C863D131F42EA000AD0F6 /* EventClient.cpp */, @@ -5472,6 +5480,8 @@ F56C872D131F42EC000AD0F6 /* HTMLUtil.h */, F56C872E131F42EC000AD0F6 /* HttpHeader.cpp */, F56C872F131F42EC000AD0F6 /* HttpHeader.h */, + DFA6BE7513FED09C0048CC11 /* HttpParser.cpp */, + DFA6BE7613FED09C0048CC11 /* HttpParser.h */, F56C8730131F42EC000AD0F6 /* InfoLoader.cpp */, F56C8731131F42EC000AD0F6 /* InfoLoader.h */, F56C8732131F42EC000AD0F6 /* LabelFormatter.cpp */, @@ -6783,6 +6793,8 @@ F5E6209613E907E200D5F2CD /* InfoBool.cpp in Sources */, DFAB04B013F8383300B70BFB /* InertialScrollingHandler.cpp in Sources */, DF3488F813FD961A0026A711 /* GUIAction.cpp in Sources */, + DFA6BE4313FECA010048CC11 /* AirPlayServer.cpp in Sources */, + DFA6BE7713FED09C0048CC11 /* HttpParser.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj index f17664a53bc3f..6a7669be57925 100644 --- a/XBMC.xcodeproj/project.pbxproj +++ b/XBMC.xcodeproj/project.pbxproj @@ -619,6 +619,10 @@ DF0DF15C13A3ADA7008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */; }; DF3488E713FD958F0026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF3488E513FD958F0026A711 /* GUIAction.cpp */; }; DF3488E813FD958F0026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF3488E513FD958F0026A711 /* GUIAction.cpp */; }; + DF34892A13FD9C780026A711 /* AirPlayServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF34892813FD9C780026A711 /* AirPlayServer.cpp */; }; + DF34892B13FD9C780026A711 /* AirPlayServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF34892813FD9C780026A711 /* AirPlayServer.cpp */; }; + DF34898213FDAAF60026A711 /* HttpParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF34898113FDAAF60026A711 /* HttpParser.cpp */; }; + DF34898313FDAAF60026A711 /* HttpParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF34898113FDAAF60026A711 /* HttpParser.cpp */; }; DFAB049813F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */; }; DFAB049913F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */; }; E306D12E0DDF7B590052C2AD /* XBMCHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */; }; @@ -2545,6 +2549,10 @@ DF0DF15A13A3ADA7008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = ""; }; DF3488E513FD958F0026A711 /* GUIAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIAction.cpp; sourceTree = ""; }; DF3488E613FD958F0026A711 /* GUIAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIAction.h; sourceTree = ""; }; + DF34892813FD9C780026A711 /* AirPlayServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirPlayServer.cpp; sourceTree = ""; }; + DF34892913FD9C780026A711 /* AirPlayServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirPlayServer.h; sourceTree = ""; }; + DF34897A13FDAA270026A711 /* HttpParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpParser.h; sourceTree = ""; }; + DF34898113FDAAF60026A711 /* HttpParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpParser.cpp; sourceTree = ""; }; DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = ""; }; DFAB049713F8376700B70BFB /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = ""; }; E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCHelper.cpp; sourceTree = ""; }; @@ -4612,6 +4620,8 @@ 4313772B12D6474F00680C15 /* libscrobbler */, 432D7CE112D86D4900CE4C49 /* linux */, 4313772312D646E300680C15 /* osx */, + DF34892813FD9C780026A711 /* AirPlayServer.cpp */, + DF34892913FD9C780026A711 /* AirPlayServer.h */, E38E16890D25F9FA00618676 /* DNSNameCache.cpp */, E38E168A0D25F9FA00618676 /* DNSNameCache.h */, E3E920010D8C622A002BF43D /* EventClient.cpp */, @@ -6738,6 +6748,8 @@ E38E1E430D25F9FD00618676 /* HTMLUtil.h */, E38E1E460D25F9FD00618676 /* HttpHeader.cpp */, E38E1E470D25F9FD00618676 /* HttpHeader.h */, + DF34898113FDAAF60026A711 /* HttpParser.cpp */, + DF34897A13FDAA270026A711 /* HttpParser.h */, E38E1E4C0D25F9FD00618676 /* InfoLoader.cpp */, E38E1E4D0D25F9FD00618676 /* InfoLoader.h */, E38E1E530D25F9FD00618676 /* LabelFormatter.cpp */, @@ -8087,6 +8099,8 @@ 7C89674613C03B22003631FE /* InfoBool.cpp in Sources */, DFAB049813F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */, DF3488E713FD958F0026A711 /* GUIAction.cpp in Sources */, + DF34892A13FD9C780026A711 /* AirPlayServer.cpp in Sources */, + DF34898213FDAAF60026A711 /* HttpParser.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -8983,6 +8997,8 @@ 7C89674813C03B22003631FE /* InfoBool.cpp in Sources */, DFAB049913F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */, DF3488E813FD958F0026A711 /* GUIAction.cpp in Sources */, + DF34892B13FD9C780026A711 /* AirPlayServer.cpp in Sources */, + DF34898313FDAAF60026A711 /* HttpParser.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/configure.in b/configure.in index 367cf5a3723ec..621ee79e1f62e 100644 --- a/configure.in +++ b/configure.in @@ -701,6 +701,7 @@ XB_FIND_SONAME([VORBISFILE], [vorbisfile]) XB_FIND_SONAME([MODPLUG], [modplug]) XB_FIND_SONAME([ASS], [ass]) XB_FIND_SONAME([MPEG2], [mpeg2]) +XB_FIND_SONAME([PLIST], [plist]) # WebServer if test "$use_webserver" = "yes"; then diff --git a/xbmc/DllPaths_generated.h.in b/xbmc/DllPaths_generated.h.in index 6dd5bd462327e..3538a226f7818 100644 --- a/xbmc/DllPaths_generated.h.in +++ b/xbmc/DllPaths_generated.h.in @@ -36,6 +36,7 @@ #define DLL_PATH_LIBRTMP "@RTMP_SONAME@" #define DLL_PATH_LIBNFS "@NFS_SONAME@" +#define DLL_PATH_LIBPLIST "@PLIST_SONAME@" #ifndef DLL_PATH_LIBCURL #define DLL_PATH_LIBCURL "@CURL_SONAME@" diff --git a/xbmc/network/Makefile.in b/xbmc/network/Makefile.in index 5487acce05b78..178ec73d3bc0e 100644 --- a/xbmc/network/Makefile.in +++ b/xbmc/network/Makefile.in @@ -6,7 +6,8 @@ INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Core \ -I@abs_top_srcdir@/lib/libUPnP/Neptune/Source/System/Posix \ -I@abs_top_srcdir@/lib/libUPnP/Neptune/Source/Core -SRCS=cddb.cpp \ +SRCS=AirPlayServer.cpp \ + cddb.cpp \ DNSNameCache.cpp \ EventClient.cpp \ EventPacket.cpp \ diff --git a/xbmc/system.h b/xbmc/system.h index b6350447c04f5..8c0350c18c66f 100644 --- a/xbmc/system.h +++ b/xbmc/system.h @@ -117,6 +117,7 @@ #endif #define HAS_ZEROCONF #define HAS_LINUX_NETWORK + #define HAS_AIRPLAY #endif /***************** @@ -146,6 +147,7 @@ #ifdef HAVE_LIBXRANDR #define HAS_XRANDR #endif +#define HAS_AIRPLAY #endif #ifdef HAVE_LIBSSH diff --git a/xbmc/utils/Makefile b/xbmc/utils/Makefile index c714ae9bbcf75..c91572ec3298a 100644 --- a/xbmc/utils/Makefile +++ b/xbmc/utils/Makefile @@ -20,6 +20,7 @@ SRCS=AlarmClock.cpp \ HTMLTable.cpp \ HTMLUtil.cpp \ HttpHeader.cpp \ + HttpParser.cpp \ InfoLoader.cpp \ JobManager.cpp \ JSONVariantParser.cpp \