diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj index 8f13cd19d64d9..788ec0be73ced 100644 --- a/XBMC-ATV2.xcodeproj/project.pbxproj +++ b/XBMC-ATV2.xcodeproj/project.pbxproj @@ -101,10 +101,6 @@ F56B15FD12CD6930009B4C96 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15FC12CD6930009B4C96 /* AudioToolbox.framework */; }; F56B15FF12CD695C009B4C96 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15FE12CD695C009B4C96 /* CoreGraphics.framework */; }; F56B161B12CD69DB009B4C96 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B161A12CD69DB009B4C96 /* ImageIO.framework */; }; - F56C7811131EC154000AD0F6 /* tinystr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C705A131EC150000AD0F6 /* tinystr.cpp */; }; - F56C7812131EC154000AD0F6 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C705C131EC150000AD0F6 /* tinyxml.cpp */; }; - F56C7813131EC154000AD0F6 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C705E131EC150000AD0F6 /* tinyxmlerror.cpp */; }; - F56C7814131EC154000AD0F6 /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C705F131EC150000AD0F6 /* tinyxmlparser.cpp */; }; F56C7815131EC154000AD0F6 /* htsatomic.c in Sources */ = {isa = PBXBuildFile; fileRef = F56C706D131EC150000AD0F6 /* htsatomic.c */; }; F56C7816131EC154000AD0F6 /* htsbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = F56C706F131EC150000AD0F6 /* htsbuf.c */; }; F56C7817131EC154000AD0F6 /* htsmsg.c in Sources */ = {isa = PBXBuildFile; fileRef = F56C7071131EC150000AD0F6 /* htsmsg.c */; }; @@ -968,6 +964,8 @@ F5E113AD1435882400175026 /* pyrendercapture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E113AC1435882400175026 /* pyrendercapture.cpp */; }; F5E6209F13E9081400D5F2CD /* InfoBool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E6209D13E9081400D5F2CD /* InfoBool.cpp */; }; F5ED8D931551FAEA00842059 /* BlurayDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ED8D911551FAEA00842059 /* BlurayDirectory.cpp */; }; + F5ED90C91553994800842059 /* XBMCTinyXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ED90C71553994800842059 /* XBMCTinyXML.cpp */; }; + F5ED90CC1553995B00842059 /* POUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ED90CA1553995B00842059 /* POUtils.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -1170,12 +1168,6 @@ F56C7055131EC150000AD0F6 /* DllStSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllStSound.h; sourceTree = ""; }; F56C7056131EC150000AD0F6 /* DllTimidity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllTimidity.h; sourceTree = ""; }; F56C7057131EC150000AD0F6 /* DllVorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllVorbisfile.h; sourceTree = ""; }; - F56C705A131EC150000AD0F6 /* tinystr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinystr.cpp; sourceTree = ""; }; - F56C705B131EC150000AD0F6 /* tinystr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinystr.h; sourceTree = ""; }; - F56C705C131EC150000AD0F6 /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml.cpp; sourceTree = ""; }; - F56C705D131EC150000AD0F6 /* tinyxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinyxml.h; sourceTree = ""; }; - F56C705E131EC150000AD0F6 /* tinyxmlerror.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlerror.cpp; sourceTree = ""; }; - F56C705F131EC150000AD0F6 /* tinyxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlparser.cpp; sourceTree = ""; }; F56C7061131EC150000AD0F6 /* libexif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libexif.h; sourceTree = ""; }; F56C7063131EC150000AD0F6 /* hdhomerun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hdhomerun.h; sourceTree = ""; }; F56C7064131EC150000AD0F6 /* hdhomerun_channelscan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hdhomerun_channelscan.h; sourceTree = ""; }; @@ -3024,6 +3016,10 @@ F5E6209E13E9081400D5F2CD /* InfoBool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InfoBool.h; sourceTree = ""; }; F5ED8D911551FAEA00842059 /* BlurayDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlurayDirectory.cpp; sourceTree = ""; }; F5ED8D921551FAEA00842059 /* BlurayDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlurayDirectory.h; sourceTree = ""; }; + F5ED90C71553994800842059 /* XBMCTinyXML.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCTinyXML.cpp; sourceTree = ""; }; + F5ED90C81553994800842059 /* XBMCTinyXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCTinyXML.h; sourceTree = ""; }; + F5ED90CA1553995B00842059 /* POUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = POUtils.cpp; sourceTree = ""; }; + F5ED90CB1553995B00842059 /* POUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = POUtils.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -3174,7 +3170,6 @@ F56C7088131EC150000AD0F6 /* libsquish */, F56C7CA5131EF8D8000AD0F6 /* libUPnP */, F56C7164131EC151000AD0F6 /* libXDAAP */, - F56C7059131EC150000AD0F6 /* tinyXML */, F56C716A131EC151000AD0F6 /* UnrarXLib */, F56C7050131EC150000AD0F6 /* DllAdpcm.h */, F56C7051131EC150000AD0F6 /* DllASAP.h */, @@ -3188,19 +3183,6 @@ path = lib; sourceTree = ""; }; - F56C7059131EC150000AD0F6 /* tinyXML */ = { - isa = PBXGroup; - children = ( - F56C705A131EC150000AD0F6 /* tinystr.cpp */, - F56C705B131EC150000AD0F6 /* tinystr.h */, - F56C705C131EC150000AD0F6 /* tinyxml.cpp */, - F56C705D131EC150000AD0F6 /* tinyxml.h */, - F56C705E131EC150000AD0F6 /* tinyxmlerror.cpp */, - F56C705F131EC150000AD0F6 /* tinyxmlparser.cpp */, - ); - path = tinyXML; - sourceTree = ""; - }; F56C7060131EC150000AD0F6 /* libexif */ = { isa = PBXGroup; children = ( @@ -5349,6 +5331,8 @@ F56C7753131EC154000AD0F6 /* PerformanceSample.h */, F56C7754131EC154000AD0F6 /* PerformanceStats.cpp */, F56C7755131EC154000AD0F6 /* PerformanceStats.h */, + F5ED90CA1553995B00842059 /* POUtils.cpp */, + F5ED90CB1553995B00842059 /* POUtils.h */, 18ACF8E113597B0000B67371 /* RecentlyAddedJob.cpp */, 18ACF8E213597B0000B67371 /* RecentlyAddedJob.h */, F56C7758131EC154000AD0F6 /* RegExp.cpp */, @@ -5390,6 +5374,8 @@ F56C7772131EC154000AD0F6 /* Win32Exception.cpp */, F56C7773131EC154000AD0F6 /* Win32Exception.h */, F56C7774131EC154000AD0F6 /* WindowsShortcut.h */, + F5ED90C71553994800842059 /* XBMCTinyXML.cpp */, + F5ED90C81553994800842059 /* XBMCTinyXML.h */, F56C7710131EC153000AD0F6 /* XMLUtils.cpp */, F56C7711131EC153000AD0F6 /* XMLUtils.h */, ); @@ -6169,10 +6155,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F56C7811131EC154000AD0F6 /* tinystr.cpp in Sources */, - F56C7812131EC154000AD0F6 /* tinyxml.cpp in Sources */, - F56C7813131EC154000AD0F6 /* tinyxmlerror.cpp in Sources */, - F56C7814131EC154000AD0F6 /* tinyxmlparser.cpp in Sources */, F56C7815131EC154000AD0F6 /* htsatomic.c in Sources */, F56C7816131EC154000AD0F6 /* htsbuf.c in Sources */, F56C7817131EC154000AD0F6 /* htsmsg.c in Sources */, @@ -7104,6 +7086,8 @@ DF33C2A415509C1B0046CDCB /* XbmcContext.cpp in Sources */, DF33C2AE15509C5A0046CDCB /* ilog.cpp in Sources */, F5ED8D931551FAEA00842059 /* BlurayDirectory.cpp in Sources */, + F5ED90C91553994800842059 /* XBMCTinyXML.cpp in Sources */, + F5ED90CC1553995B00842059 /* POUtils.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7206,6 +7190,7 @@ "-lfreetype", "-lfontconfig", "-lsqlite3", + "-ltinyxml", "-lsamplerate", "-lmicrohttpd", "-lsmbclient", @@ -7319,6 +7304,7 @@ "-lfreetype", "-lfontconfig", "-lsqlite3", + "-ltinyxml", "-lsamplerate", "-lmicrohttpd", "-lsmbclient", diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj index 020f3a188a473..22631226be7e9 100644 --- a/XBMC-IOS.xcodeproj/project.pbxproj +++ b/XBMC-IOS.xcodeproj/project.pbxproj @@ -100,10 +100,6 @@ F56B14A512CAF523009B4C96 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B14A412CAF523009B4C96 /* AudioToolbox.framework */; }; F56B15D512CD67A9009B4C96 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15D412CD67A9009B4C96 /* CoreGraphics.framework */; }; F56B160812CD6999009B4C96 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B160712CD6999009B4C96 /* ImageIO.framework */; }; - F56C87FE131F42ED000AD0F6 /* tinystr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8040131F42E5000AD0F6 /* tinystr.cpp */; }; - F56C87FF131F42ED000AD0F6 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8042131F42E5000AD0F6 /* tinyxml.cpp */; }; - F56C8800131F42ED000AD0F6 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8044131F42E5000AD0F6 /* tinyxmlerror.cpp */; }; - F56C8801131F42ED000AD0F6 /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8045131F42E5000AD0F6 /* tinyxmlparser.cpp */; }; F56C8802131F42ED000AD0F6 /* htsatomic.c in Sources */ = {isa = PBXBuildFile; fileRef = F56C8053131F42E5000AD0F6 /* htsatomic.c */; }; F56C8803131F42ED000AD0F6 /* htsbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = F56C8055131F42E5000AD0F6 /* htsbuf.c */; }; F56C8804131F42ED000AD0F6 /* htsmsg.c in Sources */ = {isa = PBXBuildFile; fileRef = F56C8057131F42E5000AD0F6 /* htsmsg.c */; }; @@ -967,6 +963,8 @@ F5E112EC143577A000175026 /* Peripherals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E112D4143577A000175026 /* Peripherals.cpp */; }; F5E6209613E907E200D5F2CD /* InfoBool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E6209413E907E200D5F2CD /* InfoBool.cpp */; }; F5ED8D961551FB1000842059 /* BlurayDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ED8D941551FB1000842059 /* BlurayDirectory.cpp */; }; + F5ED90B8155398BB00842059 /* POUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ED90B6155398BB00842059 /* POUtils.cpp */; }; + F5ED90BB155398CB00842059 /* XBMCTinyXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ED90B9155398CB00842059 /* XBMCTinyXML.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -1167,12 +1165,6 @@ F56C803B131F42E5000AD0F6 /* DllStSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllStSound.h; sourceTree = ""; }; F56C803C131F42E5000AD0F6 /* DllTimidity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllTimidity.h; sourceTree = ""; }; F56C803D131F42E5000AD0F6 /* DllVorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllVorbisfile.h; sourceTree = ""; }; - F56C8040131F42E5000AD0F6 /* tinystr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinystr.cpp; sourceTree = ""; }; - F56C8041131F42E5000AD0F6 /* tinystr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinystr.h; sourceTree = ""; }; - F56C8042131F42E5000AD0F6 /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml.cpp; sourceTree = ""; }; - F56C8043131F42E5000AD0F6 /* tinyxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinyxml.h; sourceTree = ""; }; - F56C8044131F42E5000AD0F6 /* tinyxmlerror.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlerror.cpp; sourceTree = ""; }; - F56C8045131F42E5000AD0F6 /* tinyxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlparser.cpp; sourceTree = ""; }; F56C8047131F42E5000AD0F6 /* libexif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libexif.h; sourceTree = ""; }; F56C8049131F42E5000AD0F6 /* hdhomerun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hdhomerun.h; sourceTree = ""; }; F56C804A131F42E5000AD0F6 /* hdhomerun_channelscan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hdhomerun_channelscan.h; sourceTree = ""; }; @@ -3022,6 +3014,10 @@ F5E6209513E907E200D5F2CD /* InfoBool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InfoBool.h; sourceTree = ""; }; F5ED8D941551FB1000842059 /* BlurayDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlurayDirectory.cpp; sourceTree = ""; }; F5ED8D951551FB1000842059 /* BlurayDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlurayDirectory.h; sourceTree = ""; }; + F5ED90B6155398BB00842059 /* POUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = POUtils.cpp; sourceTree = ""; }; + F5ED90B7155398BB00842059 /* POUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = POUtils.h; sourceTree = ""; }; + F5ED90B9155398CB00842059 /* XBMCTinyXML.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCTinyXML.cpp; sourceTree = ""; }; + F5ED90BA155398CB00842059 /* XBMCTinyXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCTinyXML.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -3171,7 +3167,6 @@ F56C806E131F42E5000AD0F6 /* libsquish */, F56C8070131F42E5000AD0F6 /* libUPnP */, F56C8146131F42E6000AD0F6 /* libXDAAP */, - F56C803F131F42E5000AD0F6 /* tinyXML */, F56C814C131F42E6000AD0F6 /* UnrarXLib */, F56C8036131F42E5000AD0F6 /* DllAdpcm.h */, F56C8037131F42E5000AD0F6 /* DllASAP.h */, @@ -3185,19 +3180,6 @@ path = lib; sourceTree = ""; }; - F56C803F131F42E5000AD0F6 /* tinyXML */ = { - isa = PBXGroup; - children = ( - F56C8040131F42E5000AD0F6 /* tinystr.cpp */, - F56C8041131F42E5000AD0F6 /* tinystr.h */, - F56C8042131F42E5000AD0F6 /* tinyxml.cpp */, - F56C8043131F42E5000AD0F6 /* tinyxml.h */, - F56C8044131F42E5000AD0F6 /* tinyxmlerror.cpp */, - F56C8045131F42E5000AD0F6 /* tinyxmlparser.cpp */, - ); - path = tinyXML; - sourceTree = ""; - }; F56C8046131F42E5000AD0F6 /* libexif */ = { isa = PBXGroup; children = ( @@ -5714,6 +5696,8 @@ F56C8742131F42EC000AD0F6 /* PerformanceSample.h */, F56C8743131F42EC000AD0F6 /* PerformanceStats.cpp */, F56C8744131F42EC000AD0F6 /* PerformanceStats.h */, + F5ED90B6155398BB00842059 /* POUtils.cpp */, + F5ED90B7155398BB00842059 /* POUtils.h */, 18ACF8FB13597B5700B67371 /* RecentlyAddedJob.cpp */, 18ACF8FC13597B5700B67371 /* RecentlyAddedJob.h */, F56C8747131F42EC000AD0F6 /* RegExp.cpp */, @@ -5755,6 +5739,8 @@ F56C8761131F42EC000AD0F6 /* Win32Exception.cpp */, F56C8762131F42EC000AD0F6 /* Win32Exception.h */, F56C8763131F42EC000AD0F6 /* WindowsShortcut.h */, + F5ED90B9155398CB00842059 /* XBMCTinyXML.cpp */, + F5ED90BA155398CB00842059 /* XBMCTinyXML.h */, F56C86FF131F42EB000AD0F6 /* XMLUtils.cpp */, F56C8700131F42EB000AD0F6 /* XMLUtils.h */, ); @@ -6180,10 +6166,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F56C87FE131F42ED000AD0F6 /* tinystr.cpp in Sources */, - F56C87FF131F42ED000AD0F6 /* tinyxml.cpp in Sources */, - F56C8800131F42ED000AD0F6 /* tinyxmlerror.cpp in Sources */, - F56C8801131F42ED000AD0F6 /* tinyxmlparser.cpp in Sources */, F56C8802131F42ED000AD0F6 /* htsatomic.c in Sources */, F56C8803131F42ED000AD0F6 /* htsbuf.c in Sources */, F56C8804131F42ED000AD0F6 /* htsmsg.c in Sources */, @@ -7115,6 +7097,8 @@ DF2E329415509B2C000F5772 /* XbmcContext.cpp in Sources */, DF33C29415509BF50046CDCB /* ilog.cpp in Sources */, F5ED8D961551FB1000842059 /* BlurayDirectory.cpp in Sources */, + F5ED90B8155398BB00842059 /* POUtils.cpp in Sources */, + F5ED90BB155398CB00842059 /* XBMCTinyXML.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7213,6 +7197,7 @@ "-lfontconfig", "-lsqlite3", "-lsamplerate", + "-ltinyxml", "-lmicrohttpd", "-lsmbclient", "-lpython2.6", @@ -7325,6 +7310,7 @@ "-lfontconfig", "-lsqlite3", "-lsamplerate", + "-ltinyxml", "-lmicrohttpd", "-lsmbclient", "-lpython2.6",