Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
commit ab82e455d479804577945d84e5bf345c2e5f4e33 2 parents e686e63 + 8ce8010
@opdenkamp opdenkamp authored
Showing with 147 additions and 29,859 deletions.
  1. +11 −9 .gitignore
  2. +9 −19 Makefile.in
  3. +2 −6 README.linux
  4. +1 −1  README.ubuntu
  5. +16 −32 XBMC-ATV2.xcodeproj/project.pbxproj
  6. +16 −32 XBMC-IOS.xcodeproj/project.pbxproj
  7. +50 −76 XBMC.xcodeproj/project.pbxproj
  8. +6 −4 addons/pvr.hts/resources/language/Dutch/strings.xml
  9. +6 −4 addons/pvr.hts/resources/language/English/strings.xml
  10. +2 −0  addons/pvr.hts/resources/settings.xml
  11. +19 −90 configure.in
  12. +0 −20 lib/addons/library.xbmc.addon/project/VS2008Express/libXBMC_addon.sln
  13. +0 −177 lib/addons/library.xbmc.addon/project/VS2008Express/libXBMC_addon.vcproj
  14. +0 −20 lib/addons/library.xbmc.gui/project/VS2008Express/libXBMC_gui.sln
  15. +0 −183 lib/addons/library.xbmc.gui/project/VS2008Express/libXBMC_gui.vcproj
  16. +0 −20 lib/addons/library.xbmc.pvr/project/VS2008Express/libXBMC_pvr.sln
  17. +0 −183 lib/addons/library.xbmc.pvr/project/VS2008Express/libXBMC_pvr.vcproj
  18. +2 −2 lib/freetype/builds/win32/vs2010/freetype.vcxproj
  19. +3 −3 lib/libass/xbmc/libass_win32/libass_win32_vs2010.vcxproj
  20. +0 −21 lib/libhts/Win32/libhts_2003.sln
  21. +0 −161 lib/libhts/Win32/libhts_2003.vcproj
  22. +0 −20 lib/libhts/Win32/libhts_2008.sln
  23. +0 −237 lib/libhts/Win32/libhts_2008.vcproj
  24. +4 −5 lib/libid3tag/libid3tag/msvc++/libid3tag.vcxproj
  25. +0 −64 lib/python/Demo/README
  26. +0 −11 lib/python/Demo/cgi/README
  27. +0 −8 lib/python/Demo/cgi/cgi0.sh
  28. +0 −14 lib/python/Demo/cgi/cgi1.py
  29. +0 −22 lib/python/Demo/cgi/cgi2.py
  30. +0 −10 lib/python/Demo/cgi/cgi3.py
  31. +0 −123 lib/python/Demo/cgi/wiki.py
  32. +0 −298 lib/python/Demo/classes/Complex.py
  33. +0 −222 lib/python/Demo/classes/Dates.py
  34. +0 −66 lib/python/Demo/classes/Dbm.py
  35. +0 −13 lib/python/Demo/classes/README
  36. +0 −93 lib/python/Demo/classes/Range.py
  37. +0 −310 lib/python/Demo/classes/Rat.py
  38. +0 −95 lib/python/Demo/classes/Rev.py
  39. +0 −54 lib/python/Demo/classes/Vec.py
  40. +0 −332 lib/python/Demo/classes/bitvec.py
  41. +0 −60 lib/python/Demo/comparisons/README
  42. +0 −4 lib/python/Demo/comparisons/patterns
  43. +0 −47 lib/python/Demo/comparisons/regextest.py
  44. +0 −51 lib/python/Demo/comparisons/sortingtest.py
  45. +0 −74 lib/python/Demo/comparisons/systemtest.py
  46. +0 −28 lib/python/Demo/curses/README
  47. +0 −222 lib/python/Demo/curses/life.py
  48. +0 −273 lib/python/Demo/curses/ncurses.py
  49. +0 −94 lib/python/Demo/curses/rain.py
  50. +0 −58 lib/python/Demo/curses/repeat.py
  51. +0 −146 lib/python/Demo/curses/tclock.py
  52. +0 −906 lib/python/Demo/curses/xmas.py
  53. +0 −57 lib/python/Demo/embed/Makefile
  54. +0 −19 lib/python/Demo/embed/README
  55. +0 −65 lib/python/Demo/embed/demo.c
  56. +0 −17 lib/python/Demo/embed/importexc.c
  57. +0 −33 lib/python/Demo/embed/loop.c
  58. +0 −248 lib/python/Demo/imputil/importers.py
  59. +0 −126 lib/python/Demo/imputil/knee.py
  60. +0 −10 lib/python/Demo/md5test/README
  61. +0 −1  lib/python/Demo/md5test/foo
  62. +0 −123 lib/python/Demo/md5test/md5driver.py
  63. +0 −113 lib/python/Demo/metaclasses/Eiffel.py
  64. +0 −169 lib/python/Demo/metaclasses/Enum.py
  65. +0 −118 lib/python/Demo/metaclasses/Meta.py
  66. +0 −45 lib/python/Demo/metaclasses/Simple.py
  67. +0 −256 lib/python/Demo/metaclasses/Synch.py
  68. +0 −144 lib/python/Demo/metaclasses/Trace.py
  69. +0 −605 lib/python/Demo/metaclasses/index.html
  70. +0 −256 lib/python/Demo/metaclasses/meta-vladimir.txt
  71. +0 −143 lib/python/Demo/newmetaclasses/Eiffel.py
  72. +0 −177 lib/python/Demo/newmetaclasses/Enum.py
  73. +0 −6 lib/python/Demo/parser/FILES
  74. +0 −25 lib/python/Demo/parser/README
  75. +0 −2  lib/python/Demo/parser/docstring.py
  76. +0 −190 lib/python/Demo/parser/example.py
  77. +0 −1  lib/python/Demo/parser/simple.py
  78. +0 −27 lib/python/Demo/parser/source.py
  79. +0 −48 lib/python/Demo/parser/test_parser.py
  80. +0 −100 lib/python/Demo/parser/texipre.dat
  81. +0 −322 lib/python/Demo/pdist/FSProxy.py
  82. +0 −198 lib/python/Demo/pdist/RCSProxy.py
  83. +0 −121 lib/python/Demo/pdist/README
  84. +0 −157 lib/python/Demo/pdist/client.py
  85. +0 −144 lib/python/Demo/pdist/cmdfw.py
  86. +0 −208 lib/python/Demo/pdist/cmptree.py
  87. +0 −364 lib/python/Demo/pdist/cvslib.py
  88. +0 −280 lib/python/Demo/pdist/cvslock.py
  89. +0 −19 lib/python/Demo/pdist/mac.py
  90. +0 −109 lib/python/Demo/pdist/makechangelog.py
  91. +0 −33 lib/python/Demo/pdist/rcsbump
  92. +0 −71 lib/python/Demo/pdist/rcsclient.py
  93. +0 −334 lib/python/Demo/pdist/rcslib.py
  94. +0 −8 lib/python/Demo/pdist/rcvs
  95. +0 −477 lib/python/Demo/pdist/rcvs.py
  96. +0 −8 lib/python/Demo/pdist/rrcs
  97. +0 −160 lib/python/Demo/pdist/rrcs.py
  98. +0 −33 lib/python/Demo/pdist/security.py
  99. +0 −145 lib/python/Demo/pdist/server.py
  100. +0 −24 lib/python/Demo/pdist/sumtree.py
  101. +0 −57 lib/python/Demo/pysvr/Makefile
  102. +0 −9 lib/python/Demo/pysvr/README
  103. +0 −370 lib/python/Demo/pysvr/pysvr.c
  104. +0 −124 lib/python/Demo/pysvr/pysvr.py
  105. +0 −10 lib/python/Demo/rpc/MANIFEST
  106. +0 −31 lib/python/Demo/rpc/README
  107. +0 −22 lib/python/Demo/rpc/T.py
  108. +0 −202 lib/python/Demo/rpc/mountclient.py
  109. +0 −201 lib/python/Demo/rpc/nfsclient.py
  110. +0 −98 lib/python/Demo/rpc/rnusersclient.py
  111. +0 −893 lib/python/Demo/rpc/rpc.py
  112. +0 −24 lib/python/Demo/rpc/test
  113. +0 −200 lib/python/Demo/rpc/xdr.py
  114. +0 −23 lib/python/Demo/scripts/README
  115. +0 −14 lib/python/Demo/scripts/beer.py
  116. +0 −198 lib/python/Demo/scripts/eqfix.py
  117. +0 −49 lib/python/Demo/scripts/fact.py
  118. +0 −40 lib/python/Demo/scripts/find-uname.py
  119. +0 −35 lib/python/Demo/scripts/from.py
  120. +0 −145 lib/python/Demo/scripts/ftpstats.py
  121. +0 −110 lib/python/Demo/scripts/lpwatch.py
  122. +0 −21 lib/python/Demo/scripts/makedir.py
  123. +0 −117 lib/python/Demo/scripts/markov.py
  124. +0 −124 lib/python/Demo/scripts/mboxconvert.py
  125. +0 −61 lib/python/Demo/scripts/mkrcs.py
  126. +0 −149 lib/python/Demo/scripts/morse.py
  127. +0 −59 lib/python/Demo/scripts/newslist.doc
  128. +0 −366 lib/python/Demo/scripts/newslist.py
  129. +0 −34 lib/python/Demo/scripts/pi.py
  130. +0 −130 lib/python/Demo/scripts/pp.py
  131. +0 −27 lib/python/Demo/scripts/primes.py
  132. +0 −85 lib/python/Demo/scripts/queens.py
  133. +0 −33 lib/python/Demo/scripts/script.py
  134. +0 −107 lib/python/Demo/scripts/unbirthday.py
  135. +0 −92 lib/python/Demo/scripts/update.py
  136. +0 −2  lib/python/Demo/scripts/wh.py
  137. +0 −22 lib/python/Demo/sockets/README
  138. +0 −15 lib/python/Demo/sockets/broadcast.py
  139. +0 −31 lib/python/Demo/sockets/echosvr.py
  140. +0 −58 lib/python/Demo/sockets/finger.py
  141. +0 −146 lib/python/Demo/sockets/ftp.py
  142. +0 −347 lib/python/Demo/sockets/gopher.py
  143. +0 −94 lib/python/Demo/sockets/mcast.py
  144. +0 −14 lib/python/Demo/sockets/radio.py
  145. +0 −35 lib/python/Demo/sockets/rpython.py
  146. +0 −52 lib/python/Demo/sockets/rpythond.py
  147. +0 −109 lib/python/Demo/sockets/telnet.py
  148. +0 −93 lib/python/Demo/sockets/throughput.py
  149. +0 −63 lib/python/Demo/sockets/udpecho.py
  150. +0 −14 lib/python/Demo/sockets/unicast.py
  151. +0 −10 lib/python/Demo/sockets/unixclient.py
  152. +0 −17 lib/python/Demo/sockets/unixserver.py
  153. +0 −159 lib/python/Demo/threads/Coroutine.py
  154. +0 −84 lib/python/Demo/threads/Generator.py
  155. +0 −13 lib/python/Demo/threads/README
  156. +0 −64 lib/python/Demo/threads/fcmp.py
  157. +0 −155 lib/python/Demo/threads/find.py
  158. +0 −105 lib/python/Demo/threads/squasher.py
  159. +0 −603 lib/python/Demo/threads/sync.py
  160. +0 −114 lib/python/Demo/threads/telnet.py
  161. +0 −89 lib/python/Demo/tix/INSTALL.txt
  162. +0 −19 lib/python/Demo/tix/README.txt
  163. +0 −50 lib/python/Demo/tix/bitmaps/about.xpm
  164. +0 −6 lib/python/Demo/tix/bitmaps/bold.xbm
  165. +0 −6 lib/python/Demo/tix/bitmaps/capital.xbm
  166. +0 −6 lib/python/Demo/tix/bitmaps/centerj.xbm
  167. +0 −14 lib/python/Demo/tix/bitmaps/combobox.xbm
  168. +0 −49 lib/python/Demo/tix/bitmaps/combobox.xpm
  169. +0 −47 lib/python/Demo/tix/bitmaps/combobox.xpm.1
  170. +0 −14 lib/python/Demo/tix/bitmaps/drivea.xbm
  171. +0 −43 lib/python/Demo/tix/bitmaps/drivea.xpm
  172. +0 −48 lib/python/Demo/tix/bitmaps/exit.xpm
  173. +0 −14 lib/python/Demo/tix/bitmaps/filebox.xbm
  174. +0 −49 lib/python/Demo/tix/bitmaps/filebox.xpm
  175. +0 −6 lib/python/Demo/tix/bitmaps/italic.xbm
  176. +0 −6 lib/python/Demo/tix/bitmaps/justify.xbm
  177. +0 −6 lib/python/Demo/tix/bitmaps/leftj.xbm
  178. +0 −14 lib/python/Demo/tix/bitmaps/netw.xbm
  179. +0 −45 lib/python/Demo/tix/bitmaps/netw.xpm
  180. +0 −48 lib/python/Demo/tix/bitmaps/optmenu.xpm
  181. +0 −6 lib/python/Demo/tix/bitmaps/rightj.xbm
  182. +0 −52 lib/python/Demo/tix/bitmaps/select.xpm
  183. BIN  lib/python/Demo/tix/bitmaps/tix.gif
  184. +0 −6 lib/python/Demo/tix/bitmaps/underline.xbm
  185. +0 −68 lib/python/Demo/tix/samples/Balloon.py
  186. +0 −44 lib/python/Demo/tix/samples/BtnBox.py
  187. +0 −196 lib/python/Demo/tix/samples/CmpImg.py
  188. +0 −102 lib/python/Demo/tix/samples/ComboBox.py
  189. +0 −122 lib/python/Demo/tix/samples/Control.py
  190. +0 −131 lib/python/Demo/tix/samples/DirList.py
  191. +0 −117 lib/python/Demo/tix/samples/DirTree.py
  192. +0 −119 lib/python/Demo/tix/samples/NoteBook.py
  193. +0 −68 lib/python/Demo/tix/samples/OptMenu.py
  194. +0 −98 lib/python/Demo/tix/samples/PanedWin.py
  195. +0 −57 lib/python/Demo/tix/samples/PopMenu.py
  196. +0 −131 lib/python/Demo/tix/samples/SHList1.py
  197. +0 −168 lib/python/Demo/tix/samples/SHList2.py
  198. +0 −80 lib/python/Demo/tix/samples/Tree.py
  199. +0 −1,003 lib/python/Demo/tix/tixwidgets.py
  200. +0 −10 lib/python/Demo/tkinter/README
  201. +0 −452 lib/python/Demo/tkinter/guido/AttrDialog.py
  202. +0 −220 lib/python/Demo/tkinter/guido/ManPage.py
  203. +0 −143 lib/python/Demo/tkinter/guido/MimeViewer.py
  204. +0 −151 lib/python/Demo/tkinter/guido/ShellWindow.py
  205. +0 −50 lib/python/Demo/tkinter/guido/brownian.py
  206. +0 −244 lib/python/Demo/tkinter/guido/canvasevents.py
  207. +0 −109 lib/python/Demo/tkinter/guido/dialog.py
  208. +0 −91 lib/python/Demo/tkinter/guido/electrons.py
  209. +0 −154 lib/python/Demo/tkinter/guido/hanoi.py
  210. +0 −17 lib/python/Demo/tkinter/guido/hello.py
  211. +0 −23 lib/python/Demo/tkinter/guido/imagedraw.py
  212. +0 −12 lib/python/Demo/tkinter/guido/imageview.py
  213. +0 −98 lib/python/Demo/tkinter/guido/kill.py
  214. +0 −37 lib/python/Demo/tkinter/guido/listtree.py
  215. +0 −285 lib/python/Demo/tkinter/guido/mbox.py
  216. +0 −47 lib/python/Demo/tkinter/guido/newmenubardemo.py
  217. +0 −27 lib/python/Demo/tkinter/guido/optionmenu.py
  218. +0 −60 lib/python/Demo/tkinter/guido/paint.py
  219. +0 −159 lib/python/Demo/tkinter/guido/rmt.py
  220. +0 −637 lib/python/Demo/tkinter/guido/solitaire.py
  221. +0 −634 lib/python/Demo/tkinter/guido/sortvisu.py
  222. +0 −845 lib/python/Demo/tkinter/guido/ss1.py
  223. +0 −128 lib/python/Demo/tkinter/guido/svkill.py
  224. +0 −55 lib/python/Demo/tkinter/guido/switch.py
  225. +0 −267 lib/python/Demo/tkinter/guido/tkman.py
  226. +0 −27 lib/python/Demo/tkinter/guido/wish.py
  227. +0 −27 lib/python/Demo/tkinter/matt/00-HELLO-WORLD.py
  228. +0 −30 lib/python/Demo/tkinter/matt/README
  229. +0 −35 lib/python/Demo/tkinter/matt/animation-simple.py
  230. +0 −44 lib/python/Demo/tkinter/matt/animation-w-velocity-ctrl.py
  231. +0 −44 lib/python/Demo/tkinter/matt/bind-w-mult-calls-p-type.py
  232. +0 −28 lib/python/Demo/tkinter/matt/canvas-demo-simple.py
  233. +0 −61 lib/python/Demo/tkinter/matt/canvas-gridding.py
  234. +0 −62 lib/python/Demo/tkinter/matt/canvas-moving-or-creating.py
  235. +0 −55 lib/python/Demo/tkinter/matt/canvas-moving-w-mouse.py
  236. +0 −78 lib/python/Demo/tkinter/matt/canvas-mult-item-sel.py
  237. +0 −49 lib/python/Demo/tkinter/matt/canvas-reading-tag-info.py
  238. +0 −36 lib/python/Demo/tkinter/matt/canvas-w-widget-draw-el.py
  239. +0 −60 lib/python/Demo/tkinter/matt/canvas-with-scrollbars.py
  240. +0 −64 lib/python/Demo/tkinter/matt/dialog-box.py
  241. +0 −24 lib/python/Demo/tkinter/matt/entry-simple.py
  242. +0 −46 lib/python/Demo/tkinter/matt/entry-with-shared-variable.py
  243. +0 −42 lib/python/Demo/tkinter/matt/killing-window-w-wm.py
  244. +0 −244 lib/python/Demo/tkinter/matt/menu-all-types-of-entries.py
  245. +0 −112 lib/python/Demo/tkinter/matt/menu-simple.py
  246. +0 −28 lib/python/Demo/tkinter/matt/not-what-you-might-think-1.py
  247. +0 −30 lib/python/Demo/tkinter/matt/not-what-you-might-think-2.py
  248. +0 −41 lib/python/Demo/tkinter/matt/packer-and-placer-together.py
  249. +0 −32 lib/python/Demo/tkinter/matt/packer-simple.py
  250. +0 −39 lib/python/Demo/tkinter/matt/placer-simple.py
  251. +0 −54 lib/python/Demo/tkinter/matt/pong-demo-1.py
  252. +0 −61 lib/python/Demo/tkinter/matt/printing-coords-of-items.py
  253. +0 −62 lib/python/Demo/tkinter/matt/radiobutton-simple.py
  254. +0 −58 lib/python/Demo/tkinter/matt/rubber-band-box-demo-1.py
  255. +0 −51 lib/python/Demo/tkinter/matt/rubber-line-demo-1.py
  256. +0 −36 lib/python/Demo/tkinter/matt/slider-demo-1.py
  257. +0 −28 lib/python/Demo/tkinter/matt/subclass-existing-widgets.py
  258. +0 −110 lib/python/Demo/tkinter/matt/two-radio-groups.py
  259. +0 −35 lib/python/Demo/tkinter/matt/window-creation-more.py
  260. +0 −31 lib/python/Demo/tkinter/matt/window-creation-simple.py
  261. +0 −45 lib/python/Demo/tkinter/matt/window-creation-w-location.py
  262. +0 −36 lib/python/Demo/xml/elem_count.py
  263. +0 −45 lib/python/Demo/xml/roundtrip.py
  264. +0 −91 lib/python/Demo/xml/rss2html.py
  265. +0 −104 lib/python/Demo/xmlrpc/xmlrpc_handler.py
  266. +0 −75 lib/python/Demo/xmlrpc/xmlrpcserver.py
  267. +0 −106 lib/python/Demo/zlib/minigzip.py
  268. +0 −35 lib/python/Demo/zlib/zlibdemo.py
  269. +0 −199 lib/python/Doc/ACKS
  270. +0 −736 lib/python/Doc/Makefile
  271. +0 −380 lib/python/Doc/Makefile.deps
Sorry, we could not display the entire diff because too many files (4,000) changed.
View
20 .gitignore
@@ -312,6 +312,9 @@ lib/cmyth/Makefile
# /project/Win32BuildSetup/dependencies
/project/Win32BuildSetup/dependencies/SDL.dll
/project/Win32BuildSetup/dependencies/glew32.dll
+/project/Win32BuildSetup/dependencies/pcre.dll
+/project/Win32BuildSetup/dependencies/pcrecpp.dll
+/project/Win32BuildSetup/dependencies/python26.dll
# /project/Win32BuildSetup/
/project/Win32BuildSetup/BuildLog.htm
@@ -368,9 +371,14 @@ lib/cmyth/Makefile
/system/libssl32.dll
/system/hdhomerun.dll
/system/ssh.dll
+/system/sqlite3.dll
+/system/libsamplerate-0.dll
# /system/cdrip
/system/cdrip/lame_enc.dll
+/system/cdrip/ogg.dll
+/system/cdrip/vorbis.dll
+/system/cdrip/vorbisenc.dll
# /system/players/dvdplayer
/system/players/dvdplayer/avcodec-52.dll
@@ -410,15 +418,7 @@ lib/cmyth/Makefile
/system/profiles.xml
# /system/python
-/system/python/Lib/
-/system/python/python24.zip
-/system/python/python24.dll
-/system/python/DLLs/_socket.pyd
-/system/python/DLLs/pyexpat.pyd
-/system/python/DLLs/select.pyd
-/system/python/DLLs/unicodedata.pyd
-/system/python/DLLs/zlib.pyd
-/system/python/DLLs/bz2.pyd
+/system/python/
# /system/webserver
/system/webserver
@@ -1055,6 +1055,8 @@ lib/cmyth/Makefile
# /xbmc/interfaces/
/xbmc/interfaces/Makefile
+/xbmc/interfaces/python/Makefile
+/xbmc/interfaces/python/xbmcmodule/Makefile
/xbmc/interfaces/python/linux/Makefile
/xbmc/interfaces/python/linux/wrapper_python.def
View
28 Makefile.in
@@ -129,7 +129,6 @@ LIB_DIRS=\
lib/libhdhomerun \
lib/libid3tag \
lib/libapetag \
- xbmc/interfaces/python/linux \
lib/cpluff \
lib/xbmc-dll-symbols \
lib/jsoncpp/src/lib_json
@@ -183,9 +182,6 @@ CLEAN_FILES=xbmc.bin xbmc-xrandr
DISTCLEAN_FILES=config.h config.log config.status tools/Linux/xbmc.sh \
tools/Linux/xbmc-standalone.sh autom4te.cache config.h.in~ \
- lib/python/Include/pyconfig.h \
- lib/python/configure.lineno \
- lib/python/libpython2.4.so.1.0 \
system/libcpluff-@ARCH@.so
all : Makefile externals xbmc.bin xbmc-xrandr skins
@@ -454,8 +450,6 @@ libaddon: exports
libpython: dllloader
$(MAKE) -C xbmc/interfaces/python
$(MAKE) -C xbmc/interfaces/python/xbmcmodule
-python: dllloader
- $(MAKE) -C xbmc/interfaces/python/linux
dvdpcodecs: dllloader
$(MAKE) -C lib
$(MAKE) -C lib/libdvd
@@ -497,8 +491,8 @@ imagelib: dllloader
$(MAKE) -C lib/cximage-6.0
codecs: papcodecs dvdpcodecs
-libs: cmyth libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so
-externals: libaddon codecs libs python pvrclients visualizations screensavers
+libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
+externals: libaddon codecs libs pvrclients visualizations screensavers
xcode_depends: \
codecs libs python pvrclients visualizations screensavers eventclients skins \
@@ -628,10 +622,7 @@ DYNOBJSXBMC= \
xbmc/pvr/windows/pvrwindows.a \
xbmc/guilib/guilib.a # must be dynamic to avoid linker errors
-ifeq ($(findstring arm,@ARCH@), arm)
-# Force external python2.6 for now!
-LIBS +=-lpython2.6
-endif
+LIBS += @PYTHON_LDFLAGS@
xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC)
ifeq ($(findstring osx,@ARCH@), osx)
@@ -681,17 +672,15 @@ endif
install-arch:
@# Arch dependent files
ifeq ($(findstring freebsd,@ARCH@), freebsd)
- @find -E system addons -type f -not -iregex ".*svn.*|.*script\.module\..*" \
- -iregex ".*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs|.*python.*\.zip" \
+ @find -E system addons -type f -not -iregex ".*svn.*" \
+ -iregex ".*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs" \
-exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
-and \
-exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
-exec printf " -- %-75.75s\r" "{}" \;
else
- @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*script\.module\..*" -iregex ".*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs|.*python.*\.zip" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
endif
- @cp -r addons/script.module.pil $(DESTDIR)$(libdir)/xbmc/addons/
- @cp -r addons/script.module.pysqlite $(DESTDIR)$(libdir)/xbmc/addons/
install-scripts:
@install -d $(DESTDIR)$(bindir)
@@ -713,13 +702,14 @@ install-datas: install-scripts
@# Arch independent files
ifeq ($(findstring bsd,@ARCH@), bsd)
@find -E addons language media sounds userdata system -type f \
- -not -iregex ".*script\.module\..*|.*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" \
+ -not -iregex ".*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
+ -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
-and \
-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
-exec printf " -- %-75.75s\r" "{}" \;
else
- @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*script\.module\..*|.*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
endif
@# Icons and links
@install -d $(DESTDIR)$(datarootdir)/applications
View
8 README.linux
@@ -53,7 +53,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev,
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
- libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl
+ libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev
*** For developers and anyone else who compiles frequently it is recommended to
use ccache
@@ -94,11 +94,7 @@ Tip: by adding -j<number> to the make command, you describe how many
$ make -j2
-.3 $ make -C lib/addons/script.module.pil
-
-.4 $ make -C lib/addons/script.module.pysqlite
-
-.5 $ make install
+.3 $ make install
This will install XBMC in the prefix provided in 4.1 as well as a launcher script.
View
2  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 subversion 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 libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
+ # sudo apt-get install subversion 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 libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev
For Ubuntu Maverick (10.10):
# sudo apt-get install autopoint
View
48 XBMC-ATV2.xcodeproj/project.pbxproj
@@ -107,7 +107,6 @@
F56C78D6131EC154000AD0F6 /* emu_dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7235131EC151000AD0F6 /* emu_dummy.cpp */; };
F56C78D7131EC154000AD0F6 /* emu_kernel32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7237131EC151000AD0F6 /* emu_kernel32.cpp */; };
F56C78D8131EC154000AD0F6 /* emu_msvcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7239131EC151000AD0F6 /* emu_msvcrt.cpp */; };
- F56C78D9131EC154000AD0F6 /* exports_python_linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C723B131EC151000AD0F6 /* exports_python_linux.cpp */; };
F56C78DA131EC154000AD0F6 /* EmuFileWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C723D131EC151000AD0F6 /* EmuFileWrapper.cpp */; };
F56C78DB131EC154000AD0F6 /* wrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = F56C723F131EC151000AD0F6 /* wrapper.c */; };
F56C78DC131EC154000AD0F6 /* ldt_keeper.c in Sources */ = {isa = PBXBuildFile; fileRef = F56C7240131EC151000AD0F6 /* ldt_keeper.c */; };
@@ -469,7 +468,6 @@
F56C7A47131EC155000AD0F6 /* KeyboardStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7558131EC152000AD0F6 /* KeyboardStat.cpp */; };
F56C7A48131EC155000AD0F6 /* MouseStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C755A131EC152000AD0F6 /* MouseStat.cpp */; };
F56C7A49131EC155000AD0F6 /* SDLJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C755C131EC152000AD0F6 /* SDLJoystick.cpp */; };
- F56C7A4A131EC155000AD0F6 /* XBPythonDllFuncs.S in Sources */ = {isa = PBXBuildFile; fileRef = F56C7565131EC152000AD0F6 /* XBPythonDllFuncs.S */; };
F56C7A4B131EC155000AD0F6 /* xbmcvfsmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7567131EC152000AD0F6 /* xbmcvfsmodule.cpp */; };
F56C7A4C131EC155000AD0F6 /* PythonAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7568131EC152000AD0F6 /* PythonAddon.cpp */; };
F56C7A4D131EC155000AD0F6 /* xbmcaddonmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C756A131EC152000AD0F6 /* xbmcaddonmodule.cpp */; };
@@ -507,7 +505,6 @@
F56C7A6D131EC155000AD0F6 /* xbmcmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C759B131EC152000AD0F6 /* xbmcmodule.cpp */; };
F56C7A6E131EC155000AD0F6 /* xbmcplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C759C131EC152000AD0F6 /* xbmcplugin.cpp */; };
F56C7A6F131EC155000AD0F6 /* XBPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C759D131EC152000AD0F6 /* XBPython.cpp */; };
- F56C7A70131EC155000AD0F6 /* XBPythonDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C759F131EC152000AD0F6 /* XBPythonDll.cpp */; };
F56C7A71131EC155000AD0F6 /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75A1131EC152000AD0F6 /* XBPyThread.cpp */; };
F56C7A72131EC155000AD0F6 /* AnnouncementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75A3131EC152000AD0F6 /* AnnouncementManager.cpp */; };
F56C7A73131EC155000AD0F6 /* Builtins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75A5131EC153000AD0F6 /* Builtins.cpp */; };
@@ -752,7 +749,7 @@
F56C7B6F131EC155000AD0F6 /* AutoSwitch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77D4131EC154000AD0F6 /* AutoSwitch.cpp */; };
F56C7B70131EC155000AD0F6 /* BackgroundInfoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77D6131EC154000AD0F6 /* BackgroundInfoLoader.cpp */; };
F56C7B71131EC155000AD0F6 /* CueDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77D8131EC154000AD0F6 /* CueDocument.cpp */; };
- F56C7B72131EC155000AD0F6 /* DateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77DA131EC154000AD0F6 /* DateTime.cpp */; };
+ F56C7B72131EC155000AD0F6 /* XBDateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77DA131EC154000AD0F6 /* XBDateTime.cpp */; };
F56C7B73131EC155000AD0F6 /* DynamicDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77DC131EC154000AD0F6 /* DynamicDll.cpp */; };
F56C7B74131EC155000AD0F6 /* Favourites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77DE131EC154000AD0F6 /* Favourites.cpp */; };
F56C7B75131EC155000AD0F6 /* FileItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77E0131EC154000AD0F6 /* FileItem.cpp */; };
@@ -790,7 +787,6 @@
F56C7BE6131EC455000AD0F6 /* LinuxRendererGLES.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BE4131EC455000AD0F6 /* LinuxRendererGLES.cpp */; };
F56C7BE9131EC46E000AD0F6 /* yuv2rgb.neon.S in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BE7131EC46E000AD0F6 /* yuv2rgb.neon.S */; };
F56C7BEC131EC495000AD0F6 /* IOSAudioRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BEA131EC495000AD0F6 /* IOSAudioRenderer.cpp */; };
- F56C7BF1131EC4CE000AD0F6 /* XBMC_cond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BED131EC4CE000AD0F6 /* XBMC_cond.cpp */; };
F56C7BF2131EC4CE000AD0F6 /* XBMC_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BEF131EC4CE000AD0F6 /* XBMC_mutex.cpp */; };
F56C7BF5131EC4E8000AD0F6 /* fastmemcpy-arm.S in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BF3131EC4E8000AD0F6 /* fastmemcpy-arm.S */; };
F56C7D83131EF8D9000AD0F6 /* NptZip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7CB2131EF8D8000AD0F6 /* NptZip.cpp */; };
@@ -909,7 +905,6 @@
F589AE7712890B9E00D8079E /* libapetag.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7012890B9E00D8079E /* libapetag.a */; };
F589AE8212890BEF00D8079E /* libsquish.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7D12890BEF00D8079E /* libsquish.a */; };
F589AE8312890BEF00D8079E /* librtv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7E12890BEF00D8079E /* librtv.a */; settings = {ATTRIBUTES = (Required, ); }; };
- F589AE8412890BEF00D8079E /* libxbms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7F12890BEF00D8079E /* libxbms.a */; settings = {ATTRIBUTES = (Required, ); }; };
F589AE8512890BEF00D8079E /* libxdaap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE8012890BEF00D8079E /* libxdaap.a */; settings = {ATTRIBUTES = (Required, ); }; };
F5A29EC312A7221B003A610C /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A29EC212A7221B003A610C /* CoreMedia.framework */; };
F5A29F2712A72246003A610C /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A29F2612A72246003A610C /* VideoToolbox.framework */; };
@@ -927,6 +922,7 @@
F5AE41111341751E0004BD79 /* SystemOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE41021341751E0004BD79 /* SystemOperations.cpp */; };
F5AE41121341751E0004BD79 /* VideoLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE41041341751E0004BD79 /* VideoLibrary.cpp */; };
F5AE41131341751E0004BD79 /* XBMCOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE41061341751E0004BD79 /* XBMCOperations.cpp */; };
+ F5AE453B134D2E720004BD79 /* JSONServiceDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE4539134D2E720004BD79 /* JSONServiceDescription.cpp */; };
F5B13837133080CB0045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13835133080CA0045076D /* libmicrohttpd.dylib */; };
F5B13E0113344F310045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13E0013344F310045076D /* DarwinUtils.mm */; };
/* End PBXBuildFile section */
@@ -1198,7 +1194,6 @@
F56C7238131EC151000AD0F6 /* emu_kernel32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emu_kernel32.h; sourceTree = "<group>"; };
F56C7239131EC151000AD0F6 /* emu_msvcrt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emu_msvcrt.cpp; sourceTree = "<group>"; };
F56C723A131EC151000AD0F6 /* emu_msvcrt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emu_msvcrt.h; sourceTree = "<group>"; };
- F56C723B131EC151000AD0F6 /* exports_python_linux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exports_python_linux.cpp; sourceTree = "<group>"; };
F56C723D131EC151000AD0F6 /* EmuFileWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmuFileWrapper.cpp; sourceTree = "<group>"; };
F56C723E131EC151000AD0F6 /* EmuFileWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuFileWrapper.h; sourceTree = "<group>"; };
F56C723F131EC151000AD0F6 /* wrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = wrapper.c; sourceTree = "<group>"; };
@@ -1969,7 +1964,6 @@
F56C7560131EC152000AD0F6 /* XBMC_keysym.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_keysym.h; sourceTree = "<group>"; };
F56C7561131EC152000AD0F6 /* XBMC_mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_mouse.h; sourceTree = "<group>"; };
F56C7562131EC152000AD0F6 /* XBMC_vkeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_vkeys.h; sourceTree = "<group>"; };
- F56C7565131EC152000AD0F6 /* XBPythonDllFuncs.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = XBPythonDllFuncs.S; sourceTree = "<group>"; };
F56C7567131EC152000AD0F6 /* xbmcvfsmodule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcvfsmodule.cpp; sourceTree = "<group>"; };
F56C7568131EC152000AD0F6 /* PythonAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PythonAddon.cpp; sourceTree = "<group>"; };
F56C7569131EC152000AD0F6 /* PythonAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PythonAddon.h; sourceTree = "<group>"; };
@@ -2026,8 +2020,6 @@
F56C759C131EC152000AD0F6 /* xbmcplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcplugin.cpp; sourceTree = "<group>"; };
F56C759D131EC152000AD0F6 /* XBPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPython.cpp; sourceTree = "<group>"; };
F56C759E131EC152000AD0F6 /* XBPython.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPython.h; sourceTree = "<group>"; };
- F56C759F131EC152000AD0F6 /* XBPythonDll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPythonDll.cpp; sourceTree = "<group>"; };
- F56C75A0131EC152000AD0F6 /* XBPythonDll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPythonDll.h; sourceTree = "<group>"; };
F56C75A1131EC152000AD0F6 /* XBPyThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPyThread.cpp; sourceTree = "<group>"; };
F56C75A2131EC152000AD0F6 /* XBPyThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPyThread.h; sourceTree = "<group>"; };
F56C75A3131EC152000AD0F6 /* AnnouncementManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnnouncementManager.cpp; sourceTree = "<group>"; };
@@ -2539,8 +2531,8 @@
F56C77D7131EC154000AD0F6 /* BackgroundInfoLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackgroundInfoLoader.h; sourceTree = "<group>"; };
F56C77D8131EC154000AD0F6 /* CueDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CueDocument.cpp; sourceTree = "<group>"; };
F56C77D9131EC154000AD0F6 /* CueDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueDocument.h; sourceTree = "<group>"; };
- F56C77DA131EC154000AD0F6 /* DateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateTime.cpp; sourceTree = "<group>"; };
- F56C77DB131EC154000AD0F6 /* DateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateTime.h; sourceTree = "<group>"; };
+ F56C77DA131EC154000AD0F6 /* XBDateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBDateTime.cpp; sourceTree = "<group>"; };
+ F56C77DB131EC154000AD0F6 /* XBDateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBDateTime.h; sourceTree = "<group>"; };
F56C77DC131EC154000AD0F6 /* DynamicDll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicDll.cpp; sourceTree = "<group>"; };
F56C77DD131EC154000AD0F6 /* DynamicDll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicDll.h; sourceTree = "<group>"; };
F56C77DE131EC154000AD0F6 /* Favourites.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Favourites.cpp; sourceTree = "<group>"; };
@@ -2618,8 +2610,6 @@
F56C7BE8131EC46E000AD0F6 /* yuv2rgb.neon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = yuv2rgb.neon.h; sourceTree = "<group>"; };
F56C7BEA131EC495000AD0F6 /* IOSAudioRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IOSAudioRenderer.cpp; path = AudioRenderers/IOSAudioRenderer.cpp; sourceTree = "<group>"; };
F56C7BEB131EC495000AD0F6 /* IOSAudioRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSAudioRenderer.h; path = AudioRenderers/IOSAudioRenderer.h; sourceTree = "<group>"; };
- F56C7BED131EC4CE000AD0F6 /* XBMC_cond.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_cond.cpp; sourceTree = "<group>"; };
- F56C7BEE131EC4CE000AD0F6 /* XBMC_cond.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_cond.h; sourceTree = "<group>"; };
F56C7BEF131EC4CE000AD0F6 /* XBMC_mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_mutex.cpp; sourceTree = "<group>"; };
F56C7BF0131EC4CE000AD0F6 /* XBMC_mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_mutex.h; sourceTree = "<group>"; };
F56C7BF3131EC4E8000AD0F6 /* fastmemcpy-arm.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = "fastmemcpy-arm.S"; sourceTree = "<group>"; };
@@ -2846,7 +2836,6 @@
F589AE7012890B9E00D8079E /* libapetag.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapetag.a; path = lib/libapetag/.libs/libapetag.a; sourceTree = "<group>"; };
F589AE7D12890BEF00D8079E /* libsquish.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsquish.a; path = lib/libsquish/libsquish.a; sourceTree = "<group>"; };
F589AE7E12890BEF00D8079E /* librtv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librtv.a; path = lib/libRTV/librtv.a; sourceTree = "<group>"; };
- F589AE7F12890BEF00D8079E /* libxbms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libxbms.a; path = lib/libXBMS/libxbms.a; sourceTree = "<group>"; };
F589AE8012890BEF00D8079E /* libxdaap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxdaap.a; path = lib/libXDAAP/libxdaap.a; sourceTree = "<group>"; };
F5A29EC212A7221B003A610C /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
F5A29F2612A72246003A610C /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/PrivateFrameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
@@ -2881,6 +2870,8 @@
F5AE41051341751E0004BD79 /* VideoLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoLibrary.h; sourceTree = "<group>"; };
F5AE41061341751E0004BD79 /* XBMCOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCOperations.cpp; sourceTree = "<group>"; };
F5AE41071341751E0004BD79 /* XBMCOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCOperations.h; sourceTree = "<group>"; };
+ F5AE4539134D2E720004BD79 /* JSONServiceDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONServiceDescription.cpp; sourceTree = "<group>"; };
+ F5AE453A134D2E720004BD79 /* JSONServiceDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONServiceDescription.h; sourceTree = "<group>"; };
F5B13835133080CA0045076D /* libmicrohttpd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmicrohttpd.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libmicrohttpd.dylib"; sourceTree = "<absolute>"; };
F5B13DFF13344F2A0045076D /* DarwinUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DarwinUtils.h; sourceTree = "<group>"; };
F5B13E0013344F310045076D /* DarwinUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DarwinUtils.mm; sourceTree = "<group>"; };
@@ -2914,7 +2905,6 @@
F589AE7712890B9E00D8079E /* libapetag.a in Frameworks */,
F589AE8212890BEF00D8079E /* libsquish.a in Frameworks */,
F589AE8312890BEF00D8079E /* librtv.a in Frameworks */,
- F589AE8412890BEF00D8079E /* libxbms.a in Frameworks */,
F589AE8512890BEF00D8079E /* libxdaap.a in Frameworks */,
F5A29EC312A7221B003A610C /* CoreMedia.framework in Frameworks */,
F5A29F2712A72246003A610C /* VideoToolbox.framework in Frameworks */,
@@ -3260,8 +3250,8 @@
F56C77D7131EC154000AD0F6 /* BackgroundInfoLoader.h */,
F56C77D8131EC154000AD0F6 /* CueDocument.cpp */,
F56C77D9131EC154000AD0F6 /* CueDocument.h */,
- F56C77DA131EC154000AD0F6 /* DateTime.cpp */,
- F56C77DB131EC154000AD0F6 /* DateTime.h */,
+ F56C77DA131EC154000AD0F6 /* XBDateTime.cpp */,
+ F56C77DB131EC154000AD0F6 /* XBDateTime.h */,
F56C77DC131EC154000AD0F6 /* DynamicDll.cpp */,
F56C77DD131EC154000AD0F6 /* DynamicDll.h */,
F56C77DE131EC154000AD0F6 /* Favourites.cpp */,
@@ -3481,7 +3471,6 @@
F56C7238131EC151000AD0F6 /* emu_kernel32.h */,
F56C7239131EC151000AD0F6 /* emu_msvcrt.cpp */,
F56C723A131EC151000AD0F6 /* emu_msvcrt.h */,
- F56C723B131EC151000AD0F6 /* exports_python_linux.cpp */,
F56C723C131EC151000AD0F6 /* util */,
F56C723F131EC151000AD0F6 /* wrapper.c */,
);
@@ -4474,12 +4463,9 @@
F56C7564131EC152000AD0F6 /* python */ = {
isa = PBXGroup;
children = (
- F56C7565131EC152000AD0F6 /* XBPythonDllFuncs.S */,
F56C7566131EC152000AD0F6 /* xbmcmodule */,
F56C759D131EC152000AD0F6 /* XBPython.cpp */,
F56C759E131EC152000AD0F6 /* XBPython.h */,
- F56C759F131EC152000AD0F6 /* XBPythonDll.cpp */,
- F56C75A0131EC152000AD0F6 /* XBPythonDll.h */,
F56C75A1131EC152000AD0F6 /* XBPyThread.cpp */,
F56C75A2131EC152000AD0F6 /* XBPyThread.h */,
);
@@ -5039,8 +5025,6 @@
F56C7708131EC153000AD0F6 /* SingleLock.h */,
F56C7709131EC153000AD0F6 /* Thread.cpp */,
F56C770A131EC153000AD0F6 /* Thread.h */,
- F56C7BED131EC4CE000AD0F6 /* XBMC_cond.cpp */,
- F56C7BEE131EC4CE000AD0F6 /* XBMC_cond.h */,
F56C7BEF131EC4CE000AD0F6 /* XBMC_mutex.cpp */,
F56C7BF0131EC4CE000AD0F6 /* XBMC_mutex.h */,
);
@@ -5731,7 +5715,6 @@
F56C7EE0131F0965000AD0F6 /* libjsoncpp.a */,
F589AE7D12890BEF00D8079E /* libsquish.a */,
F589AE7E12890BEF00D8079E /* librtv.a */,
- F589AE7F12890BEF00D8079E /* libxbms.a */,
F589AE8012890BEF00D8079E /* libxdaap.a */,
);
name = "Internal Libs";
@@ -5765,6 +5748,8 @@
F5AE40F81341751E0004BD79 /* ITransportLayer.h */,
F5AE40F91341751E0004BD79 /* JSONRPC.cpp */,
F5AE40FA1341751E0004BD79 /* JSONRPC.h */,
+ F5AE4539134D2E720004BD79 /* JSONServiceDescription.cpp */,
+ F5AE453A134D2E720004BD79 /* JSONServiceDescription.h */,
F5AE40FB1341751E0004BD79 /* JSONUtils.h */,
F5AE40FC1341751E0004BD79 /* PicturePlayerOperations.cpp */,
F5AE40FD1341751E0004BD79 /* PicturePlayerOperations.h */,
@@ -5968,7 +5953,6 @@
F56C78D6131EC154000AD0F6 /* emu_dummy.cpp in Sources */,
F56C78D7131EC154000AD0F6 /* emu_kernel32.cpp in Sources */,
F56C78D8131EC154000AD0F6 /* emu_msvcrt.cpp in Sources */,
- F56C78D9131EC154000AD0F6 /* exports_python_linux.cpp in Sources */,
F56C78DA131EC154000AD0F6 /* EmuFileWrapper.cpp in Sources */,
F56C78DB131EC154000AD0F6 /* wrapper.c in Sources */,
F56C78DC131EC154000AD0F6 /* ldt_keeper.c in Sources */,
@@ -6330,7 +6314,6 @@
F56C7A47131EC155000AD0F6 /* KeyboardStat.cpp in Sources */,
F56C7A48131EC155000AD0F6 /* MouseStat.cpp in Sources */,
F56C7A49131EC155000AD0F6 /* SDLJoystick.cpp in Sources */,
- F56C7A4A131EC155000AD0F6 /* XBPythonDllFuncs.S in Sources */,
F56C7A4B131EC155000AD0F6 /* xbmcvfsmodule.cpp in Sources */,
F56C7A4C131EC155000AD0F6 /* PythonAddon.cpp in Sources */,
F56C7A4D131EC155000AD0F6 /* xbmcaddonmodule.cpp in Sources */,
@@ -6368,7 +6351,6 @@
F56C7A6D131EC155000AD0F6 /* xbmcmodule.cpp in Sources */,
F56C7A6E131EC155000AD0F6 /* xbmcplugin.cpp in Sources */,
F56C7A6F131EC155000AD0F6 /* XBPython.cpp in Sources */,
- F56C7A70131EC155000AD0F6 /* XBPythonDll.cpp in Sources */,
F56C7A71131EC155000AD0F6 /* XBPyThread.cpp in Sources */,
F56C7A72131EC155000AD0F6 /* AnnouncementManager.cpp in Sources */,
F56C7A73131EC155000AD0F6 /* Builtins.cpp in Sources */,
@@ -6613,7 +6595,7 @@
F56C7B6F131EC155000AD0F6 /* AutoSwitch.cpp in Sources */,
F56C7B70131EC155000AD0F6 /* BackgroundInfoLoader.cpp in Sources */,
F56C7B71131EC155000AD0F6 /* CueDocument.cpp in Sources */,
- F56C7B72131EC155000AD0F6 /* DateTime.cpp in Sources */,
+ F56C7B72131EC155000AD0F6 /* XBDateTime.cpp in Sources */,
F56C7B73131EC155000AD0F6 /* DynamicDll.cpp in Sources */,
F56C7B74131EC155000AD0F6 /* Favourites.cpp in Sources */,
F56C7B75131EC155000AD0F6 /* FileItem.cpp in Sources */,
@@ -6650,7 +6632,6 @@
F56C7BE6131EC455000AD0F6 /* LinuxRendererGLES.cpp in Sources */,
F56C7BE9131EC46E000AD0F6 /* yuv2rgb.neon.S in Sources */,
F56C7BEC131EC495000AD0F6 /* IOSAudioRenderer.cpp in Sources */,
- F56C7BF1131EC4CE000AD0F6 /* XBMC_cond.cpp in Sources */,
F56C7BF2131EC4CE000AD0F6 /* XBMC_mutex.cpp in Sources */,
F56C7BF5131EC4E8000AD0F6 /* fastmemcpy-arm.S in Sources */,
F56C7D83131EF8D9000AD0F6 /* NptZip.cpp in Sources */,
@@ -6760,6 +6741,7 @@
F5AE41111341751E0004BD79 /* SystemOperations.cpp in Sources */,
F5AE41121341751E0004BD79 /* VideoLibrary.cpp in Sources */,
F5AE41131341751E0004BD79 /* XBMCOperations.cpp in Sources */,
+ F5AE453B134D2E720004BD79 /* JSONServiceDescription.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6817,6 +6799,7 @@
$XBMC_DEPENDS/include,
$XBMC_DEPENDS/include/mysql,
$XBMC_DEPENDS/include/freetype2,
+ $XBMC_DEPENDS/include/python2.6,
);
INFOPLIST_FILE = "$SRCROOT/xbmc/osx/atv2/XBMCATV2-Info.plist";
INFOPLIST_OUTPUT_FORMAT = binary;
@@ -6844,7 +6827,7 @@
PLIST_FILE_OUTPUT_FORMAT = xml;
PRODUCT_NAME = XBMC;
TARGETED_DEVICE_FAMILY = "2,3";
- USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/mysql";
+ USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
WRAPPER_EXTENSION = frappliance;
XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_arm7";
};
@@ -6889,6 +6872,7 @@
$XBMC_DEPENDS/include,
$XBMC_DEPENDS/include/mysql,
$XBMC_DEPENDS/include/freetype2,
+ $XBMC_DEPENDS/include/python2.6,
);
INFOPLIST_FILE = "$SRCROOT/xbmc/osx/atv2/XBMCATV2-Info.plist";
INFOPLIST_OUTPUT_FORMAT = binary;
@@ -6916,7 +6900,7 @@
PLIST_FILE_OUTPUT_FORMAT = xml;
PRODUCT_NAME = XBMC;
TARGETED_DEVICE_FAMILY = "2,3";
- USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/mysql";
+ USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
WRAPPER_EXTENSION = frappliance;
XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_arm7";
};
View
48 XBMC-IOS.xcodeproj/project.pbxproj
@@ -195,7 +195,6 @@
F56C88C2131F42ED000AD0F6 /* emu_dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8219131F42E6000AD0F6 /* emu_dummy.cpp */; };
F56C88C3131F42ED000AD0F6 /* emu_kernel32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C821B131F42E6000AD0F6 /* emu_kernel32.cpp */; };
F56C88C4131F42ED000AD0F6 /* emu_msvcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C821D131F42E6000AD0F6 /* emu_msvcrt.cpp */; };
- F56C88C5131F42ED000AD0F6 /* exports_python_linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C821F131F42E6000AD0F6 /* exports_python_linux.cpp */; };
F56C88C6131F42ED000AD0F6 /* EmuFileWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8221131F42E6000AD0F6 /* EmuFileWrapper.cpp */; };
F56C88C7131F42ED000AD0F6 /* wrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = F56C8223131F42E6000AD0F6 /* wrapper.c */; };
F56C88C8131F42ED000AD0F6 /* ldt_keeper.c in Sources */ = {isa = PBXBuildFile; fileRef = F56C8224131F42E6000AD0F6 /* ldt_keeper.c */; };
@@ -560,7 +559,6 @@
F56C8A31131F42ED000AD0F6 /* KeyboardStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C853B131F42E9000AD0F6 /* KeyboardStat.cpp */; };
F56C8A32131F42ED000AD0F6 /* MouseStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C853D131F42E9000AD0F6 /* MouseStat.cpp */; };
F56C8A33131F42ED000AD0F6 /* SDLJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C853F131F42E9000AD0F6 /* SDLJoystick.cpp */; };
- F56C8A34131F42ED000AD0F6 /* XBPythonDllFuncs.S in Sources */ = {isa = PBXBuildFile; fileRef = F56C8548131F42E9000AD0F6 /* XBPythonDllFuncs.S */; };
F56C8A35131F42ED000AD0F6 /* xbmcvfsmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C854A131F42E9000AD0F6 /* xbmcvfsmodule.cpp */; };
F56C8A36131F42ED000AD0F6 /* PythonAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C854B131F42E9000AD0F6 /* PythonAddon.cpp */; };
F56C8A37131F42ED000AD0F6 /* xbmcaddonmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C854D131F42E9000AD0F6 /* xbmcaddonmodule.cpp */; };
@@ -598,7 +596,6 @@
F56C8A57131F42ED000AD0F6 /* xbmcmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C857E131F42EA000AD0F6 /* xbmcmodule.cpp */; };
F56C8A58131F42ED000AD0F6 /* xbmcplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C857F131F42EA000AD0F6 /* xbmcplugin.cpp */; };
F56C8A59131F42ED000AD0F6 /* XBPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8580131F42EA000AD0F6 /* XBPython.cpp */; };
- F56C8A5A131F42ED000AD0F6 /* XBPythonDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8582131F42EA000AD0F6 /* XBPythonDll.cpp */; };
F56C8A5B131F42ED000AD0F6 /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8584131F42EA000AD0F6 /* XBPyThread.cpp */; };
F56C8A5C131F42ED000AD0F6 /* AnnouncementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8586131F42EA000AD0F6 /* AnnouncementManager.cpp */; };
F56C8A5D131F42ED000AD0F6 /* Builtins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8588131F42EA000AD0F6 /* Builtins.cpp */; };
@@ -758,7 +755,6 @@
F56C8AFD131F42ED000AD0F6 /* SharedSection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86F0131F42EB000AD0F6 /* SharedSection.cpp */; };
F56C8AFE131F42ED000AD0F6 /* SingleLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86F2131F42EB000AD0F6 /* SingleLock.cpp */; };
F56C8AFF131F42ED000AD0F6 /* Thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86F4131F42EB000AD0F6 /* Thread.cpp */; };
- F56C8B00131F42ED000AD0F6 /* XBMC_cond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86F6131F42EB000AD0F6 /* XBMC_cond.cpp */; };
F56C8B01131F42ED000AD0F6 /* XBMC_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86F8131F42EB000AD0F6 /* XBMC_mutex.cpp */; };
F56C8B02131F42ED000AD0F6 /* GLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86FC131F42EB000AD0F6 /* GLUtils.cpp */; };
F56C8B03131F42ED000AD0F6 /* XMLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86FF131F42EB000AD0F6 /* XMLUtils.cpp */; };
@@ -851,7 +847,7 @@
F56C8B5D131F42ED000AD0F6 /* AutoSwitch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87C1131F42ED000AD0F6 /* AutoSwitch.cpp */; };
F56C8B5E131F42ED000AD0F6 /* BackgroundInfoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87C3131F42ED000AD0F6 /* BackgroundInfoLoader.cpp */; };
F56C8B5F131F42ED000AD0F6 /* CueDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87C5131F42ED000AD0F6 /* CueDocument.cpp */; };
- F56C8B60131F42ED000AD0F6 /* DateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87C7131F42ED000AD0F6 /* DateTime.cpp */; };
+ F56C8B60131F42ED000AD0F6 /* XBDateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87C7131F42ED000AD0F6 /* XBDateTime.cpp */; };
F56C8B61131F42ED000AD0F6 /* DynamicDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87C9131F42ED000AD0F6 /* DynamicDll.cpp */; };
F56C8B62131F42ED000AD0F6 /* Favourites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87CB131F42ED000AD0F6 /* Favourites.cpp */; };
F56C8B63131F42ED000AD0F6 /* FileItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87CD131F42ED000AD0F6 /* FileItem.cpp */; };
@@ -898,7 +894,6 @@
F56C8C0C131F47EA000AD0F6 /* libjsoncpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C06131F47EA000AD0F6 /* libjsoncpp.a */; };
F56C8C11131F4811000AD0F6 /* libsquish.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0D131F4811000AD0F6 /* libsquish.a */; };
F56C8C12131F4811000AD0F6 /* librtv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0E131F4811000AD0F6 /* librtv.a */; };
- F56C8C13131F4811000AD0F6 /* libxbms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0F131F4811000AD0F6 /* libxbms.a */; };
F56C8C14131F4811000AD0F6 /* libxdaap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C10131F4811000AD0F6 /* libxdaap.a */; };
F57A1DB81329FAF700498CC7 /* SourcesDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F57A1DB61329FAF700498CC7 /* SourcesDirectory.cpp */; };
F5899DCE1287212700D8079E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5899DCA1287212700D8079E /* QuartzCore.framework */; };
@@ -927,6 +922,7 @@
F5AE4164134175520004BD79 /* SystemOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE4155134175520004BD79 /* SystemOperations.cpp */; };
F5AE4165134175520004BD79 /* VideoLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE4157134175520004BD79 /* VideoLibrary.cpp */; };
F5AE4166134175520004BD79 /* XBMCOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE4159134175520004BD79 /* XBMCOperations.cpp */; };
+ F5AE4530134D2E3E0004BD79 /* JSONServiceDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE452E134D2E3E0004BD79 /* JSONServiceDescription.cpp */; };
F5B1380D13306B890045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B1380C13306B890045076D /* libmicrohttpd.dylib */; };
F5B13DCF1334490D0045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13DCE1334490D0045076D /* DarwinUtils.mm */; };
/* End PBXBuildFile section */
@@ -1391,7 +1387,6 @@
F56C821C131F42E6000AD0F6 /* emu_kernel32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emu_kernel32.h; sourceTree = "<group>"; };
F56C821D131F42E6000AD0F6 /* emu_msvcrt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emu_msvcrt.cpp; sourceTree = "<group>"; };
F56C821E131F42E6000AD0F6 /* emu_msvcrt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emu_msvcrt.h; sourceTree = "<group>"; };
- F56C821F131F42E6000AD0F6 /* exports_python_linux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exports_python_linux.cpp; sourceTree = "<group>"; };
F56C8221131F42E6000AD0F6 /* EmuFileWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmuFileWrapper.cpp; sourceTree = "<group>"; };
F56C8222131F42E6000AD0F6 /* EmuFileWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuFileWrapper.h; sourceTree = "<group>"; };
F56C8223131F42E6000AD0F6 /* wrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = wrapper.c; sourceTree = "<group>"; };
@@ -2168,7 +2163,6 @@
F56C8543131F42E9000AD0F6 /* XBMC_keysym.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_keysym.h; sourceTree = "<group>"; };
F56C8544131F42E9000AD0F6 /* XBMC_mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_mouse.h; sourceTree = "<group>"; };
F56C8545131F42E9000AD0F6 /* XBMC_vkeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_vkeys.h; sourceTree = "<group>"; };
- F56C8548131F42E9000AD0F6 /* XBPythonDllFuncs.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = XBPythonDllFuncs.S; sourceTree = "<group>"; };
F56C854A131F42E9000AD0F6 /* xbmcvfsmodule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcvfsmodule.cpp; sourceTree = "<group>"; };
F56C854B131F42E9000AD0F6 /* PythonAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PythonAddon.cpp; sourceTree = "<group>"; };
F56C854C131F42E9000AD0F6 /* PythonAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PythonAddon.h; sourceTree = "<group>"; };
@@ -2225,8 +2219,6 @@
F56C857F131F42EA000AD0F6 /* xbmcplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcplugin.cpp; sourceTree = "<group>"; };
F56C8580131F42EA000AD0F6 /* XBPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPython.cpp; sourceTree = "<group>"; };
F56C8581131F42EA000AD0F6 /* XBPython.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPython.h; sourceTree = "<group>"; };
- F56C8582131F42EA000AD0F6 /* XBPythonDll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPythonDll.cpp; sourceTree = "<group>"; };
- F56C8583131F42EA000AD0F6 /* XBPythonDll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPythonDll.h; sourceTree = "<group>"; };
F56C8584131F42EA000AD0F6 /* XBPyThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPyThread.cpp; sourceTree = "<group>"; };
F56C8585131F42EA000AD0F6 /* XBPyThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPyThread.h; sourceTree = "<group>"; };
F56C8586131F42EA000AD0F6 /* AnnouncementManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnnouncementManager.cpp; sourceTree = "<group>"; };
@@ -2558,8 +2550,6 @@
F56C86F3131F42EB000AD0F6 /* SingleLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleLock.h; sourceTree = "<group>"; };
F56C86F4131F42EB000AD0F6 /* Thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Thread.cpp; sourceTree = "<group>"; };
F56C86F5131F42EB000AD0F6 /* Thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Thread.h; sourceTree = "<group>"; };
- F56C86F6131F42EB000AD0F6 /* XBMC_cond.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_cond.cpp; sourceTree = "<group>"; };
- F56C86F7131F42EB000AD0F6 /* XBMC_cond.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_cond.h; sourceTree = "<group>"; };
F56C86F8131F42EB000AD0F6 /* XBMC_mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_mutex.cpp; sourceTree = "<group>"; };
F56C86F9131F42EB000AD0F6 /* XBMC_mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_mutex.h; sourceTree = "<group>"; };
F56C86FB131F42EB000AD0F6 /* GlobalsHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlobalsHandling.h; sourceTree = "<group>"; };
@@ -2754,8 +2744,8 @@
F56C87C4131F42ED000AD0F6 /* BackgroundInfoLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackgroundInfoLoader.h; sourceTree = "<group>"; };
F56C87C5131F42ED000AD0F6 /* CueDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CueDocument.cpp; sourceTree = "<group>"; };
F56C87C6131F42ED000AD0F6 /* CueDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueDocument.h; sourceTree = "<group>"; };
- F56C87C7131F42ED000AD0F6 /* DateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateTime.cpp; sourceTree = "<group>"; };
- F56C87C8131F42ED000AD0F6 /* DateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateTime.h; sourceTree = "<group>"; };
+ F56C87C7131F42ED000AD0F6 /* XBDateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBDateTime.cpp; sourceTree = "<group>"; };
+ F56C87C8131F42ED000AD0F6 /* XBDateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBDateTime.h; sourceTree = "<group>"; };
F56C87C9131F42ED000AD0F6 /* DynamicDll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicDll.cpp; sourceTree = "<group>"; };
F56C87CA131F42ED000AD0F6 /* DynamicDll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicDll.h; sourceTree = "<group>"; };
F56C87CB131F42ED000AD0F6 /* Favourites.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Favourites.cpp; sourceTree = "<group>"; };
@@ -2834,7 +2824,6 @@
F56C8C06131F47EA000AD0F6 /* libjsoncpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsoncpp.a; path = lib/jsoncpp/src/lib_json/libjsoncpp.a; sourceTree = "<group>"; };
F56C8C0D131F4811000AD0F6 /* libsquish.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsquish.a; path = lib/libsquish/libsquish.a; sourceTree = "<group>"; };
F56C8C0E131F4811000AD0F6 /* librtv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librtv.a; path = lib/libRTV/librtv.a; sourceTree = "<group>"; };
- F56C8C0F131F4811000AD0F6 /* libxbms.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxbms.a; path = lib/libXBMS/libxbms.a; sourceTree = "<group>"; };
F56C8C10131F4811000AD0F6 /* libxdaap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxdaap.a; path = lib/libXDAAP/libxdaap.a; sourceTree = "<group>"; };
F57A1DB61329FAF700498CC7 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SourcesDirectory.cpp; sourceTree = "<group>"; };
F57A1DB71329FAF700498CC7 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourcesDirectory.h; sourceTree = "<group>"; };
@@ -2881,6 +2870,8 @@
F5AE4158134175520004BD79 /* VideoLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoLibrary.h; sourceTree = "<group>"; };
F5AE4159134175520004BD79 /* XBMCOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCOperations.cpp; sourceTree = "<group>"; };
F5AE415A134175520004BD79 /* XBMCOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCOperations.h; sourceTree = "<group>"; };
+ F5AE452E134D2E3E0004BD79 /* JSONServiceDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONServiceDescription.cpp; sourceTree = "<group>"; };
+ F5AE452F134D2E3E0004BD79 /* JSONServiceDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONServiceDescription.h; sourceTree = "<group>"; };
F5B1380C13306B890045076D /* libmicrohttpd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmicrohttpd.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libmicrohttpd.dylib"; sourceTree = "<absolute>"; };
F5B13DCD1334490D0045076D /* DarwinUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DarwinUtils.h; sourceTree = "<group>"; };
F5B13DCE1334490D0045076D /* DarwinUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DarwinUtils.mm; sourceTree = "<group>"; };
@@ -2926,7 +2917,6 @@
F56C8C0C131F47EA000AD0F6 /* libjsoncpp.a in Frameworks */,
F56C8C11131F4811000AD0F6 /* libsquish.a in Frameworks */,
F56C8C12131F4811000AD0F6 /* librtv.a in Frameworks */,
- F56C8C13131F4811000AD0F6 /* libxbms.a in Frameworks */,
F56C8C14131F4811000AD0F6 /* libxdaap.a in Frameworks */,
F5B1380D13306B890045076D /* libmicrohttpd.dylib in Frameworks */,
);
@@ -3619,8 +3609,8 @@
F56C87C4131F42ED000AD0F6 /* BackgroundInfoLoader.h */,
F56C87C5131F42ED000AD0F6 /* CueDocument.cpp */,
F56C87C6131F42ED000AD0F6 /* CueDocument.h */,
- F56C87C7131F42ED000AD0F6 /* DateTime.cpp */,
- F56C87C8131F42ED000AD0F6 /* DateTime.h */,
+ F56C87C7131F42ED000AD0F6 /* XBDateTime.cpp */,
+ F56C87C8131F42ED000AD0F6 /* XBDateTime.h */,
F56C87C9131F42ED000AD0F6 /* DynamicDll.cpp */,
F56C87CA131F42ED000AD0F6 /* DynamicDll.h */,
F56C87CB131F42ED000AD0F6 /* Favourites.cpp */,
@@ -3842,7 +3832,6 @@
F56C821C131F42E6000AD0F6 /* emu_kernel32.h */,
F56C821D131F42E6000AD0F6 /* emu_msvcrt.cpp */,
F56C821E131F42E6000AD0F6 /* emu_msvcrt.h */,
- F56C821F131F42E6000AD0F6 /* exports_python_linux.cpp */,
F56C8220131F42E6000AD0F6 /* util */,
F56C8223131F42E6000AD0F6 /* wrapper.c */,
);
@@ -4833,12 +4822,9 @@
F56C8547131F42E9000AD0F6 /* python */ = {
isa = PBXGroup;
children = (
- F56C8548131F42E9000AD0F6 /* XBPythonDllFuncs.S */,
F56C8549131F42E9000AD0F6 /* xbmcmodule */,
F56C8580131F42EA000AD0F6 /* XBPython.cpp */,
F56C8581131F42EA000AD0F6 /* XBPython.h */,
- F56C8582131F42EA000AD0F6 /* XBPythonDll.cpp */,
- F56C8583131F42EA000AD0F6 /* XBPythonDll.h */,
F56C8584131F42EA000AD0F6 /* XBPyThread.cpp */,
F56C8585131F42EA000AD0F6 /* XBPyThread.h */,
);
@@ -5407,8 +5393,6 @@
F56C86F3131F42EB000AD0F6 /* SingleLock.h */,
F56C86F4131F42EB000AD0F6 /* Thread.cpp */,
F56C86F5131F42EB000AD0F6 /* Thread.h */,
- F56C86F6131F42EB000AD0F6 /* XBMC_cond.cpp */,
- F56C86F7131F42EB000AD0F6 /* XBMC_cond.h */,
F56C86F8131F42EB000AD0F6 /* XBMC_mutex.cpp */,
F56C86F9131F42EB000AD0F6 /* XBMC_mutex.h */,
);
@@ -5731,7 +5715,6 @@
F56C8C06131F47EA000AD0F6 /* libjsoncpp.a */,
F56C8C0D131F4811000AD0F6 /* libsquish.a */,
F56C8C0E131F4811000AD0F6 /* librtv.a */,
- F56C8C0F131F4811000AD0F6 /* libxbms.a */,
F56C8C10131F4811000AD0F6 /* libxdaap.a */,
);
name = "Internal Libs";
@@ -5765,6 +5748,8 @@
F5AE414B134175520004BD79 /* ITransportLayer.h */,
F5AE414C134175520004BD79 /* JSONRPC.cpp */,
F5AE414D134175520004BD79 /* JSONRPC.h */,
+ F5AE452E134D2E3E0004BD79 /* JSONServiceDescription.cpp */,
+ F5AE452F134D2E3E0004BD79 /* JSONServiceDescription.h */,
F5AE414E134175520004BD79 /* JSONUtils.h */,
F5AE414F134175520004BD79 /* PicturePlayerOperations.cpp */,
F5AE4150134175520004BD79 /* PicturePlayerOperations.h */,
@@ -6072,7 +6057,6 @@
F56C88C2131F42ED000AD0F6 /* emu_dummy.cpp in Sources */,
F56C88C3131F42ED000AD0F6 /* emu_kernel32.cpp in Sources */,
F56C88C4131F42ED000AD0F6 /* emu_msvcrt.cpp in Sources */,
- F56C88C5131F42ED000AD0F6 /* exports_python_linux.cpp in Sources */,
F56C88C6131F42ED000AD0F6 /* EmuFileWrapper.cpp in Sources */,
F56C88C7131F42ED000AD0F6 /* wrapper.c in Sources */,
F56C88C8131F42ED000AD0F6 /* ldt_keeper.c in Sources */,
@@ -6437,7 +6421,6 @@
F56C8A31131F42ED000AD0F6 /* KeyboardStat.cpp in Sources */,
F56C8A32131F42ED000AD0F6 /* MouseStat.cpp in Sources */,
F56C8A33131F42ED000AD0F6 /* SDLJoystick.cpp in Sources */,
- F56C8A34131F42ED000AD0F6 /* XBPythonDllFuncs.S in Sources */,
F56C8A35131F42ED000AD0F6 /* xbmcvfsmodule.cpp in Sources */,
F56C8A36131F42ED000AD0F6 /* PythonAddon.cpp in Sources */,
F56C8A37131F42ED000AD0F6 /* xbmcaddonmodule.cpp in Sources */,
@@ -6475,7 +6458,6 @@
F56C8A57131F42ED000AD0F6 /* xbmcmodule.cpp in Sources */,
F56C8A58131F42ED000AD0F6 /* xbmcplugin.cpp in Sources */,
F56C8A59131F42ED000AD0F6 /* XBPython.cpp in Sources */,
- F56C8A5A131F42ED000AD0F6 /* XBPythonDll.cpp in Sources */,
F56C8A5B131F42ED000AD0F6 /* XBPyThread.cpp in Sources */,
F56C8A5C131F42ED000AD0F6 /* AnnouncementManager.cpp in Sources */,
F56C8A5D131F42ED000AD0F6 /* Builtins.cpp in Sources */,
@@ -6635,7 +6617,6 @@
F56C8AFD131F42ED000AD0F6 /* SharedSection.cpp in Sources */,
F56C8AFE131F42ED000AD0F6 /* SingleLock.cpp in Sources */,
F56C8AFF131F42ED000AD0F6 /* Thread.cpp in Sources */,
- F56C8B00131F42ED000AD0F6 /* XBMC_cond.cpp in Sources */,
F56C8B01131F42ED000AD0F6 /* XBMC_mutex.cpp in Sources */,
F56C8B02131F42ED000AD0F6 /* GLUtils.cpp in Sources */,
F56C8B03131F42ED000AD0F6 /* XMLUtils.cpp in Sources */,
@@ -6728,7 +6709,7 @@
F56C8B5D131F42ED000AD0F6 /* AutoSwitch.cpp in Sources */,
F56C8B5E131F42ED000AD0F6 /* BackgroundInfoLoader.cpp in Sources */,
F56C8B5F131F42ED000AD0F6 /* CueDocument.cpp in Sources */,
- F56C8B60131F42ED000AD0F6 /* DateTime.cpp in Sources */,
+ F56C8B60131F42ED000AD0F6 /* XBDateTime.cpp in Sources */,
F56C8B61131F42ED000AD0F6 /* DynamicDll.cpp in Sources */,
F56C8B62131F42ED000AD0F6 /* Favourites.cpp in Sources */,
F56C8B63131F42ED000AD0F6 /* FileItem.cpp in Sources */,
@@ -6775,6 +6756,7 @@
F5AE4164134175520004BD79 /* SystemOperations.cpp in Sources */,
F5AE4165134175520004BD79 /* VideoLibrary.cpp in Sources */,
F5AE4166134175520004BD79 /* XBMCOperations.cpp in Sources */,
+ F5AE4530134D2E3E0004BD79 /* JSONServiceDescription.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6831,6 +6813,7 @@
$XBMC_DEPENDS/include,
$XBMC_DEPENDS/include/mysql,
$XBMC_DEPENDS/include/freetype2,
+ $XBMC_DEPENDS/include/python2.6,
);
INFOPLIST_FILE = "$SRCROOT/xbmc/osx/ios/XBMCIOS-Info.plist";
INFOPLIST_OUTPUT_FORMAT = binary;
@@ -6855,7 +6838,7 @@
PRODUCT_NAME = XBMC;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
- USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/mysql";
+ USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
VALIDATE_PRODUCT = NO;
WRAPPER_EXTENSION = app;
XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_arm7";
@@ -6900,6 +6883,7 @@
$XBMC_DEPENDS/include,
$XBMC_DEPENDS/include/mysql,
$XBMC_DEPENDS/include/freetype2,
+ $XBMC_DEPENDS/include/python2.6,
);
INFOPLIST_FILE = "$SRCROOT/xbmc/osx/ios/XBMCIOS-Info.plist";
INFOPLIST_OUTPUT_FORMAT = binary;
@@ -6924,7 +6908,7 @@
PRODUCT_NAME = XBMC;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
- USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/mysql";
+ USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
VALIDATE_PRODUCT = NO;
WRAPPER_EXTENSION = app;
XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_arm7";
View
126 XBMC.xcodeproj/project.pbxproj
@@ -38,7 +38,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
- 183C454D130C4D55006AA317 /* xbmcvfsmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 189047D11301DEAB00C11012 /* xbmcvfsmodule.cpp */; };
+ 183C454D130C4D55006AA317 /* xbmcvfsmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 189047D11301DEAB00C11012 /* xbmcvfsmodule.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
183FDF8A11AF0B0500B81E9C /* PluginSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 183FDF8811AF0B0500B81E9C /* PluginSource.cpp */; };
183FDF8B11AF0B0500B81E9C /* PluginSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 183FDF8811AF0B0500B81E9C /* PluginSource.cpp */; };
184C472F1296BC6E0006DB3E /* Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 184C472D1296BC6E0006DB3E /* Service.cpp */; };
@@ -363,6 +363,7 @@
18C1D22E13033F6A00CFFE59 /* GLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18C1D22B13033F6A00CFFE59 /* GLUtils.cpp */; };
18CCEAEE1112F5B800615FC6 /* PCMRemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18CCEAEC1112F5B800615FC6 /* PCMRemap.cpp */; };
18CCEAEF1112F5B800615FC6 /* PCMRemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18CCEAEC1112F5B800615FC6 /* PCMRemap.cpp */; };
+ 384718D81325BA04000486D6 /* XBDateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 384718D61325BA04000486D6 /* XBDateTime.cpp */; };
431AE5D9109C1A63007428C3 /* OverlayRendererUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 431AE5D7109C1A63007428C3 /* OverlayRendererUtil.cpp */; };
431AE5DA109C1A63007428C3 /* OverlayRendererUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 431AE5D7109C1A63007428C3 /* OverlayRendererUtil.cpp */; };
43248C4E0FBE224000B88866 /* LockFree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A72B950FBC8E3B00171871 /* LockFree.cpp */; };
@@ -535,8 +536,8 @@
7CD2C3AB11940B270009EFC1 /* DirectoryNodeCountry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2C3A811940B270009EFC1 /* DirectoryNodeCountry.cpp */; };
7CD2CD0111B38B000009EFC1 /* PythonAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CCFE11B38B000009EFC1 /* PythonAddon.cpp */; };
7CD2CD0211B38B000009EFC1 /* xbmcaddonmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CD0011B38B000009EFC1 /* xbmcaddonmodule.cpp */; };
- 7CD2CD0311B38B000009EFC1 /* PythonAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CCFE11B38B000009EFC1 /* PythonAddon.cpp */; };
- 7CD2CD0411B38B000009EFC1 /* xbmcaddonmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CD0011B38B000009EFC1 /* xbmcaddonmodule.cpp */; };
+ 7CD2CD0311B38B000009EFC1 /* PythonAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CCFE11B38B000009EFC1 /* PythonAddon.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ 7CD2CD0411B38B000009EFC1 /* xbmcaddonmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CD0011B38B000009EFC1 /* xbmcaddonmodule.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
7CDAE9050FFCA3520040B25F /* DVDTSCorrection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CDAE9030FFCA3520040B25F /* DVDTSCorrection.cpp */; };
7CDAE9060FFCA3520040B25F /* DVDTSCorrection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CDAE9030FFCA3520040B25F /* DVDTSCorrection.cpp */; };
7CDAEA7D1001CD6E0040B25F /* karaokelyricstextustar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CDAEA7B1001CD6E0040B25F /* karaokelyricstextustar.cpp */; };
@@ -568,10 +569,9 @@
889B4D8E0E0EF86C00FAD25E /* RSSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 889B4D8C0E0EF86C00FAD25E /* RSSDirectory.cpp */; };
88ACB01B0DCF40800083CFDF /* ASAPFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88ACB0190DCF40800083CFDF /* ASAPFileDirectory.cpp */; };
88ACB01F0DCF409E0083CFDF /* ASAPCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88ACB01C0DCF409E0083CFDF /* ASAPCodec.cpp */; };
- 88D9FF600DD264B500EDA56F /* XBPythonDllFuncs.S in Sources */ = {isa = PBXBuildFile; fileRef = 88D9FF5F0DD264B500EDA56F /* XBPythonDllFuncs.S */; };
88ECB6590DE013C4003396A7 /* DiskArbitration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88ECB6580DE013C4003396A7 /* DiskArbitration.framework */; };
8DD76F790486A8DE00D96B5E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */; };
- C80425711158A0DE00D158A6 /* controlslider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80425701158A0DE00D158A6 /* controlslider.cpp */; };
+ C80425711158A0DE00D158A6 /* controlslider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80425701158A0DE00D158A6 /* controlslider.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
C80425721158A0DE00D158A6 /* controlslider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80425701158A0DE00D158A6 /* controlslider.cpp */; };
C84BF7341349BB74006D6FC9 /* JSONServiceDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C84BF7321349BB74006D6FC9 /* JSONServiceDescription.cpp */; };
C85EB75C1174614E0008E5A5 /* Repository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C85EB75A1174614E0008E5A5 /* Repository.cpp */; };
@@ -633,7 +633,7 @@
E33206380D5070AA00435CE3 /* DVDDemuxVobsub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */; };
E33466A60D2E5103005A65EC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E33466A50D2E5103005A65EC /* IOKit.framework */; };
E33979960D62FD48004ECDDA /* DVDInputStreamTV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E33979940D62FD47004ECDDA /* DVDInputStreamTV.cpp */; };
- E354EF040D99EDC900B55311 /* controlradiobutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E354EF030D99EDC900B55311 /* controlradiobutton.cpp */; };
+ E354EF040D99EDC900B55311 /* controlradiobutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E354EF030D99EDC900B55311 /* controlradiobutton.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
E35EF2550D380C3D00DB5CD5 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E35EF2540D380C3D00DB5CD5 /* QuickTime.framework */; };
E35EF3240D380E1E00DB5CD5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E35EF3230D380E1E00DB5CD5 /* Carbon.framework */; };
E36578880D3AA7B40033CC1C /* DVDPlayerCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E36578860D3AA7B40033CC1C /* DVDPlayerCodec.cpp */; };
@@ -666,7 +666,6 @@
E38E1F580D25F9FD00618676 /* emu_dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14B90D25F9F900618676 /* emu_dummy.cpp */; };
E38E1F5A0D25F9FD00618676 /* emu_kernel32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14BD0D25F9F900618676 /* emu_kernel32.cpp */; };
E38E1F5C0D25F9FD00618676 /* emu_msvcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14C10D25F9F900618676 /* emu_msvcrt.cpp */; };
- E38E1F6A0D25F9FD00618676 /* exports_python_linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14D90D25F9F900618676 /* exports_python_linux.cpp */; };
E38E1F6F0D25F9FD00618676 /* EmuFileWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14E30D25F9F900618676 /* EmuFileWrapper.cpp */; };
E38E1F710D25F9FD00618676 /* wrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = E38E14E80D25F9F900618676 /* wrapper.c */; };
E38E1F720D25F9FD00618676 /* ldt_keeper.c in Sources */ = {isa = PBXBuildFile; fileRef = E38E14EB0D25F9F900618676 /* ldt_keeper.c */; };
@@ -740,7 +739,6 @@
E38E1FF10D25F9FD00618676 /* YUV2RGBShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16710D25F9FA00618676 /* YUV2RGBShader.cpp */; };
E38E1FF70D25F9FD00618676 /* CueDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E167E0D25F9FA00618676 /* CueDocument.cpp */; };
E38E1FF80D25F9FD00618676 /* Database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16800D25F9FA00618676 /* Database.cpp */; };
- E38E1FF90D25F9FD00618676 /* DateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16820D25F9FA00618676 /* DateTime.cpp */; };
E38E1FFA0D25F9FD00618676 /* DetectDVDType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16840D25F9FA00618676 /* DetectDVDType.cpp */; };
E38E1FFB0D25F9FD00618676 /* DNSNameCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16890D25F9FA00618676 /* DNSNameCache.cpp */; };
E38E1FFC0D25F9FD00618676 /* DynamicDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E168C0D25F9FA00618676 /* DynamicDll.cpp */; };
@@ -909,9 +907,8 @@
E38E20D60D25F9FD00618676 /* LangCodeExpander.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18560D25F9FA00618676 /* LangCodeExpander.cpp */; };
E38E20D70D25F9FD00618676 /* LangInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18580D25F9FA00618676 /* LangInfo.cpp */; };
E38E20D80D25F9FD00618676 /* LastFmManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E185A0D25F9FA00618676 /* LastFmManager.cpp */; };
- E38E21600D25F9FD00618676 /* XBPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0D0D25F9FB00618676 /* XBPython.cpp */; };
- E38E21610D25F9FD00618676 /* XBPythonDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0F0D25F9FB00618676 /* XBPythonDll.cpp */; };
- E38E21620D25F9FD00618676 /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A110D25F9FB00618676 /* XBPyThread.cpp */; };
+ E38E21600D25F9FD00618676 /* XBPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0D0D25F9FB00618676 /* XBPython.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E21620D25F9FD00618676 /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A110D25F9FB00618676 /* XBPyThread.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
E38E21670D25F9FD00618676 /* scrobbler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A250D25F9FB00618676 /* scrobbler.cpp */; };
E38E21740D25F9FD00618676 /* MediaCrawler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ABD0D25F9FB00618676 /* MediaCrawler.cpp */; };
E38E21760D25F9FD00618676 /* PltMicroMediaController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AC20D25F9FB00618676 /* PltMicroMediaController.cpp */; };
@@ -1084,37 +1081,37 @@
E38E256D0D263A1C00618676 /* librtv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E256C0D263A1C00618676 /* librtv.a */; };
E38E25780D263BF600618676 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25770D263BF600618676 /* unpack.cpp */; };
E38E257C0D263C4400618676 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257B0D263C4400618676 /* rar.cpp */; };
- E38E259D0D263CE000618676 /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257E0D263CE000618676 /* action.cpp */; };
- E38E259E0D263CE000618676 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257F0D263CE000618676 /* control.cpp */; };
- E38E259F0D263CE000618676 /* controlbutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25800D263CE000618676 /* controlbutton.cpp */; };
- E38E25A00D263CE000618676 /* controlcheckmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25810D263CE000618676 /* controlcheckmark.cpp */; };
- E38E25A10D263CE000618676 /* controlfadelabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25820D263CE000618676 /* controlfadelabel.cpp */; };
- E38E25A20D263CE000618676 /* controlgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25830D263CE000618676 /* controlgroup.cpp */; };
- E38E25A30D263CE000618676 /* controlimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25840D263CE000618676 /* controlimage.cpp */; };
- E38E25A40D263CE000618676 /* controllabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25850D263CE000618676 /* controllabel.cpp */; };
- E38E25A50D263CE000618676 /* controllist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25860D263CE000618676 /* controllist.cpp */; };
- E38E25A60D263CE000618676 /* controlprogress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25870D263CE000618676 /* controlprogress.cpp */; };
- E38E25A70D263CE000618676 /* controlspin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25880D263CE000618676 /* controlspin.cpp */; };
- E38E25A80D263CE000618676 /* controltextbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25890D263CE000618676 /* controltextbox.cpp */; };
- E38E25A90D263CE000618676 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258A0D263CE000618676 /* dialog.cpp */; };
- E38E25AA0D263CE000618676 /* GUIPythonWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258B0D263CE000618676 /* GUIPythonWindow.cpp */; };
- E38E25AB0D263CE000618676 /* GUIPythonWindowDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258C0D263CE000618676 /* GUIPythonWindowDialog.cpp */; };
- E38E25AC0D263CE000618676 /* GUIPythonWindowXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258D0D263CE000618676 /* GUIPythonWindowXML.cpp */; };
- E38E25AD0D263CE000618676 /* GUIPythonWindowXMLDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258E0D263CE000618676 /* GUIPythonWindowXMLDialog.cpp */; };
- E38E25AE0D263CE000618676 /* infotagmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258F0D263CE000618676 /* infotagmusic.cpp */; };
- E38E25AF0D263CE000618676 /* infotagvideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25900D263CE000618676 /* infotagvideo.cpp */; };
- E38E25B00D263CE000618676 /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25910D263CE000618676 /* keyboard.cpp */; };
- E38E25B10D263CE000618676 /* listitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25920D263CE000618676 /* listitem.cpp */; };
- E38E25B20D263CE000618676 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25930D263CE000618676 /* player.cpp */; };
- E38E25B30D263CE000618676 /* pyplaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25940D263CE000618676 /* pyplaylist.cpp */; };
- E38E25B40D263CE000618676 /* PythonPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25950D263CE000618676 /* PythonPlayer.cpp */; };
- E38E25B50D263CE000618676 /* pyutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25960D263CE000618676 /* pyutil.cpp */; };
- E38E25B60D263CE000618676 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25970D263CE000618676 /* window.cpp */; };
- E38E25B70D263CE000618676 /* winxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25980D263CE000618676 /* winxml.cpp */; };
- E38E25B80D263CE000618676 /* winxmldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25990D263CE000618676 /* winxmldialog.cpp */; };
- E38E25B90D263CE000618676 /* xbmcguimodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259A0D263CE000618676 /* xbmcguimodule.cpp */; };
- E38E25BA0D263CE000618676 /* xbmcmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259B0D263CE000618676 /* xbmcmodule.cpp */; };
- E38E25BB0D263CE000618676 /* xbmcplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259C0D263CE000618676 /* xbmcplugin.cpp */; };
+ E38E259D0D263CE000618676 /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257E0D263CE000618676 /* action.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E259E0D263CE000618676 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257F0D263CE000618676 /* control.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E259F0D263CE000618676 /* controlbutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25800D263CE000618676 /* controlbutton.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25A00D263CE000618676 /* controlcheckmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25810D263CE000618676 /* controlcheckmark.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25A10D263CE000618676 /* controlfadelabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25820D263CE000618676 /* controlfadelabel.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25A20D263CE000618676 /* controlgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25830D263CE000618676 /* controlgroup.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25A30D263CE000618676 /* controlimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25840D263CE000618676 /* controlimage.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25A40D263CE000618676 /* controllabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25850D263CE000618676 /* controllabel.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25A50D263CE000618676 /* controllist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25860D263CE000618676 /* controllist.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25A60D263CE000618676 /* controlprogress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25870D263CE000618676 /* controlprogress.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25A70D263CE000618676 /* controlspin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25880D263CE000618676 /* controlspin.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25A80D263CE000618676 /* controltextbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25890D263CE000618676 /* controltextbox.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25A90D263CE000618676 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258A0D263CE000618676 /* dialog.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25AA0D263CE000618676 /* GUIPythonWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258B0D263CE000618676 /* GUIPythonWindow.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25AB0D263CE000618676 /* GUIPythonWindowDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258C0D263CE000618676 /* GUIPythonWindowDialog.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25AC0D263CE000618676 /* GUIPythonWindowXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258D0D263CE000618676 /* GUIPythonWindowXML.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25AD0D263CE000618676 /* GUIPythonWindowXMLDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258E0D263CE000618676 /* GUIPythonWindowXMLDialog.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25AE0D263CE000618676 /* infotagmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258F0D263CE000618676 /* infotagmusic.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25AF0D263CE000618676 /* infotagvideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25900D263CE000618676 /* infotagvideo.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25B00D263CE000618676 /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25910D263CE000618676 /* keyboard.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25B10D263CE000618676 /* listitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25920D263CE000618676 /* listitem.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25B20D263CE000618676 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25930D263CE000618676 /* player.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25B30D263CE000618676 /* pyplaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25940D263CE000618676 /* pyplaylist.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25B40D263CE000618676 /* PythonPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25950D263CE000618676 /* PythonPlayer.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25B50D263CE000618676 /* pyutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25960D263CE000618676 /* pyutil.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25B60D263CE000618676 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25970D263CE000618676 /* window.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25B70D263CE000618676 /* winxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25980D263CE000618676 /* winxml.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25B80D263CE000618676 /* winxmldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25990D263CE000618676 /* winxmldialog.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25B90D263CE000618676 /* xbmcguimodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259A0D263CE000618676 /* xbmcguimodule.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25BA0D263CE000618676 /* xbmcmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259B0D263CE000618676 /* xbmcmodule.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
+ E38E25BB0D263CE000618676 /* xbmcplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259C0D263CE000618676 /* xbmcplugin.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
E38E25C00D263DC100618676 /* DVDFactoryDemuxer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25BF0D263DC100618676 /* DVDFactoryDemuxer.cpp */; };
E38E25C30D263DE200618676 /* DVDDemuxFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25C20D263DE200618676 /* DVDDemuxFFmpeg.cpp */; };
E38F12C20D29FF200035C331 /* FileShoutcast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38F12C10D29FF200035C331 /* FileShoutcast.cpp */; };
@@ -1276,7 +1273,6 @@
F5A1C8D80F6B06CF00A96ABD /* emu_dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14B90D25F9F900618676 /* emu_dummy.cpp */; };
F5A1C8DA0F6B06CF00A96ABD /* emu_kernel32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14BD0D25F9F900618676 /* emu_kernel32.cpp */; };
F5A1C8DB0F6B06CF00A96ABD /* emu_msvcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14C10D25F9F900618676 /* emu_msvcrt.cpp */; };
- F5A1C8DE0F6B06CF00A96ABD /* exports_python_linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14D90D25F9F900618676 /* exports_python_linux.cpp */; };
F5A1C8DF0F6B06CF00A96ABD /* EmuFileWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14E30D25F9F900618676 /* EmuFileWrapper.cpp */; };
F5A1C8E00F6B06CF00A96ABD /* wrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = E38E14E80D25F9F900618676 /* wrapper.c */; };
F5A1C8E10F6B06CF00A96ABD /* ldt_keeper.c in Sources */ = {isa = PBXBuildFile; fileRef = E38E14EB0D25F9F900618676 /* ldt_keeper.c */; };
@@ -1350,7 +1346,6 @@
F5A1C9370F6B06CF00A96ABD /* YUV2RGBShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16710D25F9FA00618676 /* YUV2RGBShader.cpp */; };
F5A1C9390F6B06CF00A96ABD /* CueDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E167E0D25F9FA00618676 /* CueDocument.cpp */; };
F5A1C93A0F6B06CF00A96ABD /* Database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16800D25F9FA00618676 /* Database.cpp */; };
- F5A1C93B0F6B06CF00A96ABD /* DateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16820D25F9FA00618676 /* DateTime.cpp */; };
F5A1C93C0F6B06CF00A96ABD /* DetectDVDType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16840D25F9FA00618676 /* DetectDVDType.cpp */; };
F5A1C93D0F6B06CF00A96ABD /* DNSNameCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16890D25F9FA00618676 /* DNSNameCache.cpp */; };
F5A1C93E0F6B06CF00A96ABD /* DynamicDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E168C0D25F9FA00618676 /* DynamicDll.cpp */; };
@@ -1520,7 +1515,6 @@
F5A1C9FA0F6B06CF00A96ABD /* LangInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18580D25F9FA00618676 /* LangInfo.cpp */; };
F5A1C9FB0F6B06CF00A96ABD /* LastFmManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E185A0D25F9FA00618676 /* LastFmManager.cpp */; };
F5A1CA010F6B06CF00A96ABD /* XBPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0D0D25F9FB00618676 /* XBPython.cpp */; };
- F5A1CA020F6B06CF00A96ABD /* XBPythonDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0F0D25F9FB00618676 /* XBPythonDll.cpp */; };
F5A1CA030F6B06CF00A96ABD /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A110D25F9FB00618676 /* XBPyThread.cpp */; };
F5A1CA040F6B06CF00A96ABD /* scrobbler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A250D25F9FB00618676 /* scrobbler.cpp */; };
F5A1CA050F6B06CF00A96ABD /* MediaCrawler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ABD0D25F9FB00618676 /* MediaCrawler.cpp */; };
@@ -1746,7 +1740,6 @@
F5A1CB520F6B06CF00A96ABD /* MusicFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 880DBE530DC224A100E26B71 /* MusicFileDirectory.cpp */; };
F5A1CB530F6B06CF00A96ABD /* ASAPFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88ACB0190DCF40800083CFDF /* ASAPFileDirectory.cpp */; };
F5A1CB540F6B06CF00A96ABD /* ASAPCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88ACB01C0DCF409E0083CFDF /* ASAPCodec.cpp */; };
- F5A1CB560F6B06CF00A96ABD /* XBPythonDllFuncs.S in Sources */ = {isa = PBXBuildFile; fileRef = 88D9FF5F0DD264B500EDA56F /* XBPythonDllFuncs.S */; };
F5A1CB570F6B06CF00A96ABD /* DVDOverlayCodecSSA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8883CE9E0DD817D1004E8B72 /* DVDOverlayCodecSSA.cpp */; };
F5A1CB580F6B06CF00A96ABD /* DVDSubtitleParserSSA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8883CEA30DD81807004E8B72 /* DVDSubtitleParserSSA.cpp */; };
F5A1CB590F6B06CF00A96ABD /* DVDSubtitlesLibass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8883CEA50DD81807004E8B72 /* DVDSubtitlesLibass.cpp */; };
@@ -1872,7 +1865,6 @@
F5B5D015133AFB2E007A4B4C /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138641330811D0045076D /* libmicrohttpd.dylib */; };
F5B5D64D133FC2C1007A4B4C /* libsquish.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352CED1071634600706B8A /* libsquish.a */; };
F5B5D64E133FC2E7007A4B4C /* librtv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E256C0D263A1C00618676 /* librtv.a */; };
- F5B5D64F133FC2EF007A4B4C /* libxbms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5DC8816110A4B8900EE1B15 /* libxbms.a */; };
F5B5D650133FC312007A4B4C /* libxdaap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E25680D2639F100618676 /* libxdaap.a */; };
F5BDB80C120202F400F0B710 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */; };
F5BDB80D120202F400F0B710 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */; };
@@ -1890,7 +1882,6 @@
F5DC87E3110A287400EE1B15 /* RingBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DC87E1110A287400EE1B15 /* RingBuffer.cpp */; };
F5DC8801110A46C700EE1B15 /* ModplugCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DC8800110A46C700EE1B15 /* ModplugCodec.cpp */; };
F5DC8802110A46C700EE1B15 /* ModplugCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DC8800110A46C700EE1B15 /* ModplugCodec.cpp */; };
- F5DC8817110A4B8900EE1B15 /* libxbms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5DC8816110A4B8900EE1B15 /* libxbms.a */; };
F5DC888B110A654000EE1B15 /* libapetag.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5DC888A110A654000EE1B15 /* libapetag.a */; };
F5DC888C110A654000EE1B15 /* libapetag.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5DC888A110A654000EE1B15 /* libapetag.a */; };
F5E55B5D10741272006E788A /* DVDPlayerTeletext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E55B5B10741272006E788A /* DVDPlayerTeletext.cpp */; };
@@ -2300,6 +2291,8 @@
18C1D22C13033F6A00CFFE59 /* GLUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLUtils.h; sourceTree = "<group>"; };
18CCEAEC1112F5B800615FC6 /* PCMRemap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCMRemap.cpp; sourceTree = "<group>"; };
18CCEAED1112F5B800615FC6 /* PCMRemap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PCMRemap.h; sourceTree = "<group>"; };
+ 384718D61325BA04000486D6 /* XBDateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBDateTime.cpp; sourceTree = "<group>"; };
+ 384718D71325BA04000486D6 /* XBDateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBDateTime.h; sourceTree = "<group>"; };
38B2BBD013131B4A00F83309 /* GlobalsHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlobalsHandling.h; sourceTree = "<group>"; };
430C881312D64A730098821A /* IPowerSyscall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IPowerSyscall.h; sourceTree = "<group>"; };
431376FF12D6455C00680C15 /* GUIDialogCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogCache.h; sourceTree = "<group>"; };
@@ -2556,7 +2549,6 @@
88ACB01C0DCF409E0083CFDF /* ASAPCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ASAPCodec.cpp; sourceTree = "<group>"; };
88ACB01D0DCF409E0083CFDF /* ASAPCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASAPCodec.h; sourceTree = "<group>"; };
88ACB01E0DCF409E0083CFDF /* DllASAP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllASAP.h; sourceTree = "<group>"; };
- 88D9FF5F0DD264B500EDA56F /* XBPythonDllFuncs.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = XBPythonDllFuncs.S; sourceTree = "<group>"; };
88ECB6580DE013C4003396A7 /* DiskArbitration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiskArbitration.framework; path = /System/Library/Frameworks/DiskArbitration.framework; sourceTree = "<absolute>"; };
8DD76F7E0486A8DE00D96B5E /* XBMC */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XBMC; sourceTree = BUILT_PRODUCTS_DIR; };
C80425701158A0DE00D158A6 /* controlslider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlslider.cpp; sourceTree = "<group>"; };
@@ -2737,7 +2729,6 @@
E38E14BE0D25F9F900618676 /* emu_kernel32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emu_kernel32.h; sourceTree = "<group>"; };
E38E14C10D25F9F900618676 /* emu_msvcrt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emu_msvcrt.cpp; sourceTree = "<group>"; };
E38E14C20D25F9F900618676 /* emu_msvcrt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emu_msvcrt.h; sourceTree = "<group>"; };
- E38E14D90D25F9F900618676 /* exports_python_linux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exports_python_linux.cpp; sourceTree = "<group>"; };
E38E14E30D25F9F900618676 /* EmuFileWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmuFileWrapper.cpp; sourceTree = "<group>"; };
E38E14E40D25F9F900618676 /* EmuFileWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuFileWrapper.h; sourceTree = "<group>"; };
E38E14E80D25F9F900618676 /* wrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = wrapper.c; sourceTree = "<group>"; };
@@ -2928,8 +2919,6 @@
E38E167F0D25F9FA00618676 /* CueDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueDocument.h; sourceTree = "<group>"; };
E38E16800D25F9FA00618676 /* Database.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Database.cpp; sourceTree = "<group>"; };
E38E16810D25F9FA00618676 /* Database.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Database.h; sourceTree = "<group>"; };
- E38E16820D25F9FA00618676 /* DateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateTime.cpp; sourceTree = "<group>"; };
- E38E16830D25F9FA00618676 /* DateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateTime.h; sourceTree = "<group>"; };
E38E16840D25F9FA00618676 /* DetectDVDType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DetectDVDType.cpp; sourceTree = "<group>"; };
E38E16850D25F9FA00618676 /* DetectDVDType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetectDVDType.h; sourceTree = "<group>"; };
E38E16860D25F9FA00618676 /* DllImageLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllImageLib.h; sourceTree = "<group>"; };
@@ -3302,8 +3291,6 @@
E38E1A080D25F9FB00618676 /* winxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winxml.h; sourceTree = "<group>"; };
E38E1A0D0D25F9FB00618676 /* XBPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPython.cpp; sourceTree = "<group>"; };
E38E1A0E0D25F9FB00618676 /* XBPython.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPython.h; sourceTree = "<group>"; };
- E38E1A0F0D25F9FB00618676 /* XBPythonDll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPythonDll.cpp; sourceTree = "<group>"; };
- E38E1A100D25F9FB00618676 /* XBPythonDll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPythonDll.h; sourceTree = "<group>"; };
E38E1A110D25F9FB00618676 /* XBPyThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPyThread.cpp; sourceTree = "<group>"; };
E38E1A120D25F9FB00618676 /* XBPyThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPyThread.h; sourceTree = "<group>"; };
E38E1A140D25F9FB00618676 /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = "<group>"; };
@@ -3958,7 +3945,6 @@
F5DC87E1110A287400EE1B15 /* RingBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RingBuffer.cpp; sourceTree = "<group>"; };
F5DC87FF110A46C700EE1B15 /* ModplugCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModplugCodec.h; sourceTree = "<group>"; };
F5DC8800110A46C700EE1B15 /* ModplugCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModplugCodec.cpp; sourceTree = "<group>"; };
- F5DC8816110A4B8900EE1B15 /* libxbms.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxbms.a; path = lib/libXBMS/libxbms.a; sourceTree = "<group>"; };
F5DC888A110A654000EE1B15 /* libapetag.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapetag.a; path = lib/libapetag/.libs/libapetag.a; sourceTree = "<group>"; };
F5E55B5B10741272006E788A /* DVDPlayerTeletext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDPlayerTeletext.cpp; sourceTree = "<group>"; };
F5E55B5C10741272006E788A /* DVDPlayerTeletext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDPlayerTeletext.h; sourceTree = "<group>"; };
@@ -4036,7 +4022,6 @@
88ECB6590DE013C4003396A7 /* DiskArbitration.framework in Frameworks */,
F59879080FBAA0C3008EF4FB /* QuartzCore.framework in Frameworks */,
43352CEE1071634600706B8A /* libsquish.a in Frameworks */,
- F5DC8817110A4B8900EE1B15 /* libxbms.a in Frameworks */,
F5DC888B110A654000EE1B15 /* libapetag.a in Frameworks */,
F5A7A6F1112893330059D6AA /* libjsoncpp.a in Frameworks */,
F56C8CE2131F5DAF000AD0F6 /* libc.dylib in Frameworks */,
@@ -4111,7 +4096,6 @@
F5B5D015133AFB2E007A4B4C /* libmicrohttpd.dylib in Frameworks */,
F5B5D64D133FC2C1007A4B4C /* libsquish.a in Frameworks */,
F5B5D64E133FC2E7007A4B4C /* librtv.a in Frameworks */,
- F5B5D64F133FC2EF007A4B4C /* libxbms.a in Frameworks */,
F5B5D650133FC312007A4B4C /* libxdaap.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -5332,8 +5316,6 @@
E38E14730D25F9F900618676 /* BackgroundInfoLoader.h */,
E38E167E0D25F9FA00618676 /* CueDocument.cpp */,
E38E167F0D25F9FA00618676 /* CueDocument.h */,
- E38E16820D25F9FA00618676 /* DateTime.cpp */,
- E38E16830D25F9FA00618676 /* DateTime.h */,
E38E168C0D25F9FA00618676 /* DynamicDll.cpp */,
E38E168D0D25F9FA00618676 /* DynamicDll.h */,
E38E16900D25F9FA00618676 /* Favourites.cpp */,
@@ -5386,6 +5368,8 @@
E38E1E9A0D25F9FD00618676 /* ViewDatabase.h */,
E38E1EA70D25F9FD00618676 /* XBApplicationEx.cpp */,
E38E1EA80D25F9FD00618676 /* XBApplicationEx.h */,
+ 384718D61325BA04000486D6 /* XBDateTime.cpp */,
+ 384718D71325BA04000486D6 /* XBDateTime.h */,
E38E1ED10D25F9FD00618676 /* xbmc.cpp */,
);
path = xbmc;
@@ -5487,7 +5471,6 @@
E38E14BE0D25F9F900618676 /* emu_kernel32.h */,
E38E14C10D25F9F900618676 /* emu_msvcrt.cpp */,
E38E14C20D25F9F900618676 /* emu_msvcrt.h */,
- E38E14D90D25F9F900618676 /* exports_python_linux.cpp */,
E38E14E20D25F9F900618676 /* util */,
E38E14E80D25F9F900618676 /* wrapper.c */,
);
@@ -6235,12 +6218,9 @@
E38E19820D25F9FB00618676 /* python */ = {
isa = PBXGroup;
children = (
- 88D9FF5F0DD264B500EDA56F /* XBPythonDllFuncs.S */,
E38E19DA0D25F9FB00618676 /* xbmcmodule */,
E38E1A0D0D25F9FB00618676 /* XBPython.cpp */,
E38E1A0E0D25F9FB00618676 /* XBPython.h */,
- E38E1A0F0D25F9FB00618676 /* XBPythonDll.cpp */,
- E38E1A100D25F9FB00618676 /* XBPythonDll.h */,
E38E1A110D25F9FB00618676 /* XBPyThread.cpp */,
E38E1A120D25F9FB00618676 /* XBPyThread.h */,
);
@@ -7224,7 +7204,6 @@
F5A7A6F0112893330059D6AA /* libjsoncpp.a */,
43352CED1071634600706B8A /* libsquish.a */,
E38E256C0D263A1C00618676 /* librtv.a */,
- F5DC8816110A4B8900EE1B15 /* libxbms.a */,
E38E25680D2639F100618676 /* libxdaap.a */,
);
name = "internal libs";
@@ -7258,8 +7237,6 @@
F5AE407F13415D9E0004BD79 /* json-rpc */ = {
isa = PBXGroup;
children = (
- C84BF7321349BB74006D6FC9 /* JSONServiceDescription.cpp */,
- C84BF7331349BB74006D6FC9 /* JSONServiceDescription.h */,
F5AE408013415D9E0004BD79 /* AudioLibrary.cpp */,
F5AE408113415D9E0004BD79 /* AudioLibrary.h */,
F5AE408213415D9E0004BD79 /* AVPlayerOperations.cpp */,
@@ -7274,6 +7251,8 @@
F5AE408B13415D9E0004BD79 /* ITransportLayer.h */,
F5AE408C13415D9E0004BD79 /* JSONRPC.cpp */,
F5AE408D13415D9E0004BD79 /* JSONRPC.h */,
+ C84BF7321349BB74006D6FC9 /* JSONServiceDescription.cpp */,
+ C84BF7331349BB74006D6FC9 /* JSONServiceDescription.h */,
F5AE408E13415D9E0004BD79 /* JSONUtils.h */,
F5AE409013415D9E0004BD79 /* PicturePlayerOperations.cpp */,
F5AE409113415D9E0004BD79 /* PicturePlayerOperations.h */,
@@ -7598,7 +7577,6 @@
E38E1F580D25F9FD00618676 /* emu_dummy.cpp in Sources */,
E38E1F5A0D25F9FD00618676 /* emu_kernel32.cpp in Sources */,
E38E1F5C0D25F9FD00618676 /* emu_msvcrt.cpp in Sources */,
- E38E1F6A0D25F9FD00618676 /* exports_python_linux.cpp in Sources */,
E38E1F6F0D25F9FD00618676 /* EmuFileWrapper.cpp in Sources */,
E38E1F710D25F9FD00618676 /* wrapper.c in Sources */,
E38E1F720D25F9FD00618676 /* ldt_keeper.c in Sources */,
@@ -7672,7 +7650,6 @@
E38E1FF10D25F9FD00618676 /* YUV2RGBShader.cpp in Sources */,
E38E1FF70D25F9FD00618676 /* CueDocument.cpp in Sources */,
E38E1FF80D25F9FD00618676 /* Database.cpp in Sources */,
- E38E1FF90D25F9FD00618676 /* DateTime.cpp in Sources */,
E38E1FFA0D25F9FD00618676 /* DetectDVDType.cpp in Sources */,
E38E1FFB0D25F9FD00618676 /* DNSNameCache.cpp in Sources */,
E38E1FFC0D25F9FD00618676 /* DynamicDll.cpp in Sources */,
@@ -7842,7 +7819,6 @@
E38E20D70D25F9FD00618676 /* LangInfo.cpp in Sources */,
E38E20D80D25F9FD00618676 /* LastFmManager.cpp in Sources */,
E38E21600D25F9FD00618676 /* XBPython.cpp in Sources */,
- E38E21610D25F9FD00618676 /* XBPythonDll.cpp in Sources */,
E38E21620D25F9FD00618676 /* XBPyThread.cpp in Sources */,
E38E21670D25F9FD00618676 /* scrobbler.cpp in Sources */,
E38E21740D25F9FD00618676 /* MediaCrawler.cpp in Sources */,
@@ -8068,7 +8044,6 @@
880DBE550DC224A100E26B71 /* MusicFileDirectory.cpp in Sources */,
88ACB01B0DCF40800083CFDF /* ASAPFileDirectory.cpp in Sources */,
88ACB01F0DCF409E0083CFDF /* ASAPCodec.cpp in Sources */,
- 88D9FF600DD264B500EDA56F /* XBPythonDllFuncs.S in Sources */,
8883CEA10DD817D1004E8B72 /* DVDOverlayCodecSSA.cpp in Sources */,
8883CEA70DD81807004E8B72 /* DVDSubtitleParserSSA.cpp in Sources */,
8883CEA80DD81807004E8B72 /* DVDSubtitlesLibass.cpp in Sources */,
@@ -8508,6 +8483,7 @@
F5AE40A713415D9E0004BD79 /* VideoLibrary.cpp in Sources */,
F5AE40A813415D9E0004BD79 /* XBMCOperations.cpp in Sources */,
C84BF7341349BB74006D6FC9 /* JSONServiceDescription.cpp in Sources */,
+ 384718D81325BA04000486D6 /* XBDateTime.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -8537,7 +8513,6 @@
F5A1C8D80F6B06CF00A96ABD /* emu_dummy.cpp in Sources */,
F5A1C8DA0F6B06CF00A96ABD /* emu_kernel32.cpp in Sources */,
F5A1C8DB0F6B06CF00A96ABD /* emu_msvcrt.cpp in Sources */,
- F5A1C8DE0F6B06CF00A96ABD /* exports_python_linux.cpp in Sources */,
F5A1C8DF0F6B06CF00A96ABD /* EmuFileWrapper.cpp in Sources */,
F5A1C8E00F6B06CF00A96ABD /* wrapper.c in Sources */,
F5A1C8E10F6B06CF00A96ABD /* ldt_keeper.c in Sources */,
@@ -8611,7 +8586,6 @@
F5A1C9370F6B06CF00A96ABD /* YUV2RGBShader.cpp in Sources */,
F5A1C9390F6B06CF00A96ABD /* CueDocument.cpp in Sources */,
F5A1C93A0F6B06CF00A96ABD /* Database.cpp in Sources */,
- F5A1C93B0F6B06CF00A96ABD /* DateTime.cpp in Sources */,
F5A1C93C0F6B06CF00A96ABD /* DetectDVDType.cpp in Sources */,
F5A1C93D0F6B06CF00A96ABD /* DNSNameCache.cpp in Sources */,
F5A1C93E0F6B06CF00A96ABD /* DynamicDll.cpp in Sources */,
@@ -8781,7 +8755,6 @@
F5A1C9FA0F6B06CF00A96ABD /* LangInfo.cpp in Sources */,
F5A1C9FB0F6B06CF00A96ABD /* LastFmManager.cpp in Sources */,
F5A1CA010F6B06CF00A96ABD /* XBPython.cpp in Sources */,
- F5A1CA020F6B06CF00A96ABD /* XBPythonDll.cpp in Sources */,
F5A1CA030F6B06CF00A96ABD /* XBPyThread.cpp in Sources */,
F5A1CA040F6B06CF00A96ABD /* scrobbler.cpp in Sources */,
F5A1CA050F6B06CF00A96ABD /* MediaCrawler.cpp in Sources */,
@@ -9007,7 +8980,6 @@
F5A1CB520F6B06CF00A96ABD /* MusicFileDirectory.cpp in Sources */,
F5A1CB530F6B06CF00A96ABD /* ASAPFileDirectory.cpp in Sources */,
F5A1CB540F6B06CF00A96ABD /* ASAPCodec.cpp in Sources */,
- F5A1CB560F6B06CF00A96ABD /* XBPythonDllFuncs.S in Sources */,
F5A1CB570F6B06CF00A96ABD /* DVDOverlayCodecSSA.cpp in Sources */,
F5A1CB580F6B06CF00A96ABD /* DVDSubtitleParserSSA.cpp in Sources */,
F5A1CB590F6B06CF00A96ABD /* DVDSubtitlesLibass.cpp in Sources */,
@@ -9449,6 +9421,7 @@
$XBMC_DEPENDS/include,
$XBMC_DEPENDS/include/mysql,
$XBMC_DEPENDS/include/freetype2,
+ $XBMC_DEPENDS/include/python2.6,
);
INFOPLIST_FILE = $SRCROOT/xbmc/osx/Info.plist;
INSTALL_PATH = /usr/local/bin;
@@ -9487,7 +9460,7 @@
"-all_load",
);
PRODUCT_NAME = XBMC;
- USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/mysql";
+ USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
XBMC_DEPENDS = "/Users/Shared/xbmc-depends/osx-10.4_i386";
ZERO_LINK = NO;
};
@@ -9536,6 +9509,7 @@
$XBMC_DEPENDS/include,
$XBMC_DEPENDS/include/mysql,
$XBMC_DEPENDS/include/freetype2,
+ $XBMC_DEPENDS/include/python2.6,
);
INFOPLIST_FILE = $SRCROOT/xbmc/osx/Info.plist;
INSTALL_PATH = /usr/local/bin;
@@ -9574,7 +9548,7 @@
"-all_load",
);
PRODUCT_NAME = XBMC;
- USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/mysql";
+ USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
XBMC_DEPENDS = "/Users/Shared/xbmc-depends/osx-10.4_i386";
ZERO_LINK = NO;
};
View
10 addons/pvr.hts/resources/language/Dutch/strings.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- settings labels -->
- <string id="30000">Tvheadend server naam of IP</string>
- <string id="30001">HTTP Poort</string>
- <string id="30002">HTSP Poort</string>
+ <string id="30000">Tvheadend server naam of IP adres</string>
+ <string id="30001">HTTP poort</string>
+ <string id="30002">HTSP poort</string>
<string id="30003">Gebruikersnaam</string>
<string id="30004">Wachtwoord</string>
- <string id="30005">Sla eerste I-frame over</string>
+ <string id="30005">Sla eerste I-frames over</string>
+ <string id="30006">Verbinding timeout in seconden</string>
+ <string id="30007">Antwoord timeout in seconden</string>
</strings>
View
10 addons/pvr.hts/resources/language/English/strings.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- settings labels -->
- <string id="30000">Tvheadend Hostname or IP</string>
- <string id="30001">HTTP Port</string>
- <string id="30002">HTSP Port</string>
+ <string id="30000">Tvheadend hostname or IP address</string>
+ <string id="30001">HTTP port</string>
+ <string id="30002">HTSP port</string>
<string id="30003">Username</string>
<string id="30004">Password</string>
- <string id="30005">Skip First I-frame</string>
+ <string id="30005">Skip first I-frames</string>
+ <string id="30006">Connect timeout in seconds</string>
+ <string id="30007">Response timeout in seconds</string>
</strings>
View
2  addons/pvr.hts/resources/settings.xml
@@ -6,4 +6,6 @@
<setting id="user" type="text" label="30003" default="" />
<setting id="pass" type="text" label="30004" option="hidden" default="" />
<setting id="skip_I_frame_count" type="enum" label="30005" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15" default="0" />
+ <setting id="connect_timeout" type="enum" label="30006" values="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60" default="29" />
+ <setting id="response_timeout" type="enum" label="30007" values="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60" default="1" />
</settings>
View
109 configure.in
@@ -2,9 +2,10 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([xbmc], [9.11], [http://trac.xbmc.org])
+AC_INIT([xbmc], [11.0], [http://trac.xbmc.org])
AC_CONFIG_HEADERS([xbmc/config.h])
AH_TOP([#pragma once])
+m4_include([m4/ax_python_devel.m4])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([foreign])
@@ -95,8 +96,6 @@ external_libraries_enabled="== Use of all supported external libraries enabled.
external_libraries_disabled="== Use of all supported external libraries disabled. =="
external_ffmpeg_enabled="== Use of external ffmpeg enabled. =="
external_ffmpeg_disabled="== Use of external ffmpeg disabled. =="
-external_python_enabled="== Use of external python enabled. =="
-external_python_disabled="== Use of external python disabled. =="
ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
dashes="------------------------"
final_message="\n XBMC Configuration:"
@@ -303,12 +302,6 @@ AC_ARG_ENABLE([external-ffmpeg],
[use_external_ffmpeg=$enableval],
[use_external_ffmpeg=$use_external_libraries])
-AC_ARG_ENABLE([external-python],
- [AS_HELP_STRING([--enable-external-python],
- [enable use of external python library (default is no) 'Linux only'])],
- [use_external_python=$enableval],
- [use_external_python=$use_external_libraries])
-
### End of external library options
if test "x$host_vendor" != "xapple"; then
@@ -346,6 +339,11 @@ case $host in
ARCHTYPE=$HOSTTYPE
AC_SUBST([ARCHTYPE])
AC_SUBST(ARCH_DEFINES, "-D_ARMEL")
+ PYTHON_VERSION=2.6
+ PYTHON_CPPFLAGS=-I${prefix}/include/python2.6
+ PYTHON_LDFLAGS=-L${prefix}/lib -lpython2.6
+ PYTHON_SITE_PKG=${prefix}/lib/python2.6/site-packages
+ PYTHON_NOVERSIONCHECK="no-check"
;;
i386-apple-darwin*)
use_joystick=no
@@ -889,31 +887,16 @@ else
AC_DEFINE([PIX_FMT_VDPAU_MPEG4_IN_AVUTIL], [1], [Whether AVUtil defines PIX_FMT_VDPAU_MPEG4.])
fi
-# External Python
-if test "$use_external_python" = "yes"; then
- AC_CHECK_LIB([python2.6], [main],
- [AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
- [Define to 1 if you have the 'python2.6' library.])
- USE_PYTHON2_6=1],
- [AC_CHECK_LIB([python2.5], [main],
- [AC_DEFINE([HAVE_LIBPYTHON2_5], [1],
- [Define to 1 if you have the 'python2.5' library.])
- USE_PYTHON2_5=1],
- [AC_CHECK_LIB([python2.4], [main],
- [AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
- [Define to 1 if you have the 'python2.4' library.])
- USE_PYTHON2_4=1],
- [AC_MSG_ERROR($missing_library)] )] )] )
-
- AC_MSG_NOTICE($external_python_enabled)
- test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
- test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
- test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
- USE_EXTERNAL_PYTHON=1
- AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.])
+# Python
+if test -z "$PYTHON_NOVERSIONCHECK"; then
+ AX_PYTHON_DEVEL([>= 2.4])
+ PYTHON_VERSION=$ac_python_version
+fi
+
+if test -z "$PYTHON_VERSION"; then
+ AC_MSG_ERROR([Can't find a Python version.])
else
- AC_MSG_NOTICE($external_python_disabled)
- USE_EXTERNAL_PYTHON=0
+ AC_MSG_NOTICE([Using Python $PYTHON_VERSION])
fi
# VDPAU
@@ -1352,11 +1335,6 @@ if test "$use_external_ffmpeg" = "yes"; then
else
final_message="$final_message\n External FFmpeg:\tNo"
fi
-if test "$use_external_python" = "yes"; then
- final_message="$final_message\n External Python:\tYes"
-else
- final_message="$final_message\n External Python:\tNo"
-fi
OUTPUT_FILES="Makefile \
Makefile.include \
@@ -1400,7 +1378,8 @@ OUTPUT_FILES="Makefile \
lib/libsquish/Makefile \
lib/libid3tag/Makefile \
lib/cximage-6.0/Makefile \
- xbmc/interfaces/python/linux/Makefile \
+ xbmc/interfaces/python/Makefile \
+ xbmc/interfaces/python/xbmcmodule/Makefile \
lib/libUPnP/Makefile \
xbmc/DllPaths_generated.h \
xbmc/linux/Makefile \
@@ -1437,10 +1416,7 @@ AC_SUBST(SDL_DEFINES)
AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM)
AC_SUBST(USE_EXTERNAL_FFMPEG)
-AC_SUBST(USE_EXTERNAL_PYTHON)
-AC_SUBST(USE_PYTHON2_6)
-AC_SUBST(USE_PYTHON2_5)
-AC_SUBST(USE_PYTHON2_4)
+AC_SUBST(PYTHON_VERSION)
AC_SUBST(OUTPUT_FILES)
AC_SUBST(HAVE_XBMC_NONFREE)
AC_SUBST(USE_ASAP_CODEC)
@@ -1515,53 +1491,6 @@ fi
])
])
-XB_CONFIG_MODULE([lib/python], [
- if test "$host_vendor" = "apple" ; then
- ./configure \
- --host=$host_alias \
- --build=$build_alias \
- --target=$target_alias \
- --enable-ipv6 \
- --enable-unicode=ucs4 \
- --without-cxx \
- --enable-shared \
- --without-pymalloc \
- --with-suffix=.exe \
- LDFLAGS="-L/opt/local/lib" \
- OPT="-Wno-deprecated-declarations -I/opt/local/include" \
- CFLAGS="$CFLAGS" &&
- sed -i bak -e "s/define HAVE_GETC_UNLOCKED 1/undef HAVE_GETC_UNLOCKED/" pyconfig.h &&
- sed -i bak -e "s/define HAVE_FSEEKO 1/undef HAVE_FSEEKO/" pyconfig.h &&
- sed -i bak -e "s/define HAVE_FTELLO 1/undef HAVE_FTELLO/" pyconfig.h &&
- sed -i bak -e "s/define HAVE_FTRUNCATE 1/undef HAVE_FTRUNCATE/" pyconfig.h &&
- sed -i bak -e "s/define HAVE_FPATHCONF 1/undef HAVE_FPATHCONF/" pyconfig.h &&
- sed -i bak -e "s/define HAVE_FSYNC 1/undef HAVE_FSYNC/" pyconfig.h &&
- sed -i bak -e "s/define HAVE_FCHDIR 1/undef HAVE_FCHDIR/" pyconfig.h &&
- sed -i bak -e "s/define _POSIX_C_SOURCE 200112L/undef _POSIX_C_SOURCE/" pyconfig.h &&
- sed -i bak -e "s/define _XOPEN_SOURCE 600/undef _XOPEN_SOURCE/" pyconfig.h &&
- sed -i bak -e "s/define _XOPEN_SOURCE_EXTENDED 1/undef _XOPEN_SOURCE_EXTENDED/" pyconfig.h &&
- echo "#define SETPGRP_HAVE_ARG 1" >> pyconfig.h &&
- cp pyconfig.h Include
- else
- ./configure \
- --host=$host_alias \
- --build=$build_alias \
- --target=$target_alias \
- --disable-ipv6 \
- --enable-unicode=ucs4 \
- --without-cxx \
- --enable-shared \
- --without-pymalloc \
- --prefix=`pwd`/../../xbmc/interfaces/python/linux/python-lib CFLAGS="$CFLAGS" \
- CC="$CC" \
- CXX="$CXX" &&
- sed -i -e "s/define HAVE_GETC_UNLOCKED 1/undef HAVE_GETC_UNLOCKED/" pyconfig.h &&
- sed -i -e "s/define _POSIX_C_SOURCE 200112L/undef _POSIX_C_SOURCE/" pyconfig.h &&
- sed -i -e "s/define _XOPEN_SOURCE 600/undef _XOPEN_SOURCE/" pyconfig.h &&
- cp pyconfig.h Include
- fi
-], [$USE_EXTERNAL_PYTHON])
-
XB_CONFIG_MODULE([lib/ffmpeg], [
if test "$host_vendor" = "apple" ; then
./configure \
View
20 lib/addons/library.xbmc.addon/project/VS2008Express/libXBMC_addon.sln
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libXBMC_addon", "libXBMC_addon.vcproj", "{D450FE9A-CE56-4496-B4AB-379094E642F2}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D450FE9A-CE56-4496-B4AB-379094E642F2}.Debug|Win32.ActiveCfg = Debug|Win32
- {D450FE9A-CE56-4496-B4AB-379094E642F2}.Debug|Win32.Build.0 = Debug|Win32
- {D450FE9A-CE56-4496-B4AB-379094E642F2}.Release|Win32.ActiveCfg = Release|Win32
- {D450FE9A-CE56-4496-B4AB-379094E642F2}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
View
177 lib/addons/library.xbmc.addon/project/VS2008Express/libXBMC_addon.vcproj
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="libXBMC_addon"
- ProjectGUID="{2DCEA60B-4EBC-4DB7-9FBD-297C1EFD95D7}"
- RootNamespace="XBMC_VDR"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc"
- PreprocessorDefinitions="_WIN32;_DEBUG;_WINDOWS;VDR_EXPORTS;_WIN32PC;_WINSOCKAPI_;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
- ExceptionHandling="1"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="../../../../../addons/library.xbmc.addon/$(ProjectName).dll"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="1"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="../../../../../addons/library.xbmc.addon/$(ProjectName).dll"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\libXBMC_addon.cpp"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
View
20 lib/addons/library.xbmc.gui/project/VS2008Express/libXBMC_gui.sln
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00