Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Code changes for external python. Changes include submissions by cpts…

…piff,WiSo,blinkseb, and jcarroll

changed: limit the scope of the python includes. this will be useful in an upcomming patch. credit jcarroll
changed: use a m4 check to set the python path directly, and ditch the old hardcoded version nonsense. credit jcarroll
Fixed the build for when --enable-external-python is not used.
Fixed the warnings due to Python.h not being the first header as required by Python.
Final fix to the osx make build so that external python works. Needed to change the m4 macro to account for .dylib on osx and the dependant ./configure call to pass the installed location of the python xbmc is to be built against. Also updated .gitignore for the osx dependency builds.
There was a name collision between the python datetime.h and the xbmc/DateTime.h on file systems that are not case sensitive. This is now fixed by renaming DateTime.h to XBDateTime.h
By request, the .cpp files now sorted alphabetically in the Makefile.in.
the m4 macros is a mess of mixed spaces and tabs. In order to make my couple line change more readable I changed the spaces to tabs so it would be consistent with the surrounding area. This was per the request of jmarshall.
Fixed an error where under internal python the correct header wasn't being used.
if --enable-external-python is selected then don't build the internal python at all and not using any of the wrappers.
Modified the xcode project to work with the external python changes.
There was a bug in the Makefile.in where the internal python build target wasn't being set correctly. This is now fixed.
[WIN32] removed some uneeded files, renamed DateTime* to XBDateTime* and defined USE_EXTERNAL_PYTHON
Added xbmc/cores/DllLoader/Makefile to .gitignore since it's being autogened.
Made it so that the distinction between internal and external python is limited to mostly just Makefile's now. Most of the code no longer needs to make the distinction. This should make it much easier to move forward in windows and eventually with removing the internal python.
updated: .gitignore
  • Loading branch information...
commit b768137069e3b0db7710c31b45222bfca1a0641b 1 parent 3b508b2
spiff authored Jim Carroll committed

Showing 84 changed files with 613 additions and 835 deletions. Show diff stats Hide diff stats

  1. +4 9 .gitignore
  2. +22 1 Makefile.in
  3. +44 58 XBMC.xcodeproj/project.pbxproj
  4. +17 25 configure.in
  5. +333 0 m4/ax_python_devel.m4
  6. +4 5 project/VS2010Express/XBMC.vcxproj
  7. +10 13 project/VS2010Express/XBMC.vcxproj.filters
  8. +2 1  tools/osx/osx-depends/xbmc/Makefile
  9. +1 1  xbmc/FileItem.h
  10. +1 1  xbmc/GUIInfoManager.h
  11. +1 1  xbmc/Makefile.in
  12. +1 1  xbmc/TextureDatabase.cpp
  13. +1 1  xbmc/{DateTime.cpp → XBDateTime.cpp}
  14. 0  xbmc/{DateTime.h → XBDateTime.h}
  15. +1 1  xbmc/addons/AddonDatabase.cpp
  16. +1 1  xbmc/addons/Repository.h
  17. +1 1  xbmc/addons/Scraper.h
  18. +1 1  xbmc/dialogs/GUIDialogSeekBar.h
  19. +1 1  xbmc/filesystem/MythDirectory.h
  20. +1 1  xbmc/filesystem/MythFile.cpp
  21. +1 1  xbmc/filesystem/MythFile.h
  22. +1 1  xbmc/filesystem/MythSession.cpp
  23. +1 1  xbmc/guilib/GUIEditControl.cpp
  24. +0 9 xbmc/interfaces/python/Makefile
  25. +14 0 xbmc/interfaces/python/Makefile.in
  26. +10 20 xbmc/interfaces/python/XBPyThread.cpp
  27. +2 18 xbmc/interfaces/python/XBPyThread.h
  28. +9 16 xbmc/interfaces/python/XBPython.cpp
  29. +2 2 xbmc/interfaces/python/XBPython.h
  30. +2 12 xbmc/interfaces/python/XBPythonDll.cpp
  31. +3 0  xbmc/interfaces/python/XBPythonDll.h
  32. +1 9 xbmc/interfaces/python/XBPythonDllFuncs.S
  33. +17 16 xbmc/interfaces/python/xbmcmodule/GUIPythonWindow.cpp
  34. +6 22 xbmc/interfaces/python/xbmcmodule/GUIPythonWindow.h
  35. +10 10 xbmc/interfaces/python/xbmcmodule/GUIPythonWindowXML.cpp
  36. +3 3 xbmc/interfaces/python/xbmcmodule/GUIPythonWindowXML.h
  37. +3 1 xbmc/interfaces/python/xbmcmodule/{Makefile → Makefile.in}
  38. +1 16 xbmc/interfaces/python/xbmcmodule/PythonAddon.h
  39. +1 16 xbmc/interfaces/python/xbmcmodule/PythonPlayer.h
  40. +2 16 xbmc/interfaces/python/xbmcmodule/action.h
  41. +2 16 xbmc/interfaces/python/xbmcmodule/control.h
  42. +2 16 xbmc/interfaces/python/xbmcmodule/controlbutton.cpp
  43. +2 16 xbmc/interfaces/python/xbmcmodule/controlcheckmark.cpp
  44. +2 16 xbmc/interfaces/python/xbmcmodule/controlfadelabel.cpp
  45. +2 16 xbmc/interfaces/python/xbmcmodule/controlgroup.cpp
  46. +2 16 xbmc/interfaces/python/xbmcmodule/controlimage.cpp
  47. +2 16 xbmc/interfaces/python/xbmcmodule/controllabel.cpp
  48. +2 16 xbmc/interfaces/python/xbmcmodule/controllist.cpp
  49. +2 16 xbmc/interfaces/python/xbmcmodule/controlprogress.cpp
  50. +2 16 xbmc/interfaces/python/xbmcmodule/controlradiobutton.cpp
  51. +2 16 xbmc/interfaces/python/xbmcmodule/controlslider.cpp
  52. +2 16 xbmc/interfaces/python/xbmcmodule/controlspin.cpp
  53. +2 16 xbmc/interfaces/python/xbmcmodule/controltextbox.cpp
  54. +1 16 xbmc/interfaces/python/xbmcmodule/dialog.cpp
  55. +2 16 xbmc/interfaces/python/xbmcmodule/dialog.h
  56. +1 16 xbmc/interfaces/python/xbmcmodule/infotagmusic.h
  57. +2 16 xbmc/interfaces/python/xbmcmodule/infotagvideo.h
  58. +2 16 xbmc/interfaces/python/xbmcmodule/keyboard.h
  59. +2 16 xbmc/interfaces/python/xbmcmodule/listitem.cpp
  60. +2 16 xbmc/interfaces/python/xbmcmodule/listitem.h
  61. +1 1  xbmc/interfaces/python/xbmcmodule/player.cpp
  62. +2 16 xbmc/interfaces/python/xbmcmodule/player.h
  63. +3 15 xbmc/interfaces/python/xbmcmodule/pyplaylist.cpp
  64. +1 16 xbmc/interfaces/python/xbmcmodule/pyplaylist.h
  65. +2 17 xbmc/interfaces/python/xbmcmodule/pyutil.h
  66. +2 16 xbmc/interfaces/python/xbmcmodule/window.h
  67. +2 14 xbmc/interfaces/python/xbmcmodule/winxml.cpp
  68. +1 16 xbmc/interfaces/python/xbmcmodule/winxml.h
  69. +4 15 xbmc/interfaces/python/xbmcmodule/winxmldialog.cpp
  70. +1 16 xbmc/interfaces/python/xbmcmodule/xbmcaddonmodule.cpp
  71. +3 20 xbmc/interfaces/python/xbmcmodule/xbmcguimodule.cpp
  72. +2 14 xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp
  73. +3 3 xbmc/interfaces/python/xbmcmodule/xbmcplugin.cpp
  74. +2 14 xbmc/interfaces/python/xbmcmodule/xbmcvfsmodule.cpp
  75. +1 1  xbmc/network/WebServer.cpp
  76. +1 1  xbmc/pictures/PictureInfoTag.cpp
  77. +1 1  xbmc/playlists/SmartPlayList.cpp
  78. +1 1  xbmc/utils/StringUtils.h
  79. +1 1  xbmc/utils/TimeUtils.cpp
  80. +1 1  xbmc/utils/Weather.cpp
  81. +1 1  xbmc/video/VideoInfoDownloader.h
  82. +1 1  xbmc/video/VideoInfoScanner.h
  83. +1 1  xbmc/video/windows/GUIWindowFullScreen.cpp
  84. +1 1  xbmc/win32/XBMC_PC.cpp
13 .gitignore
@@ -385,15 +385,7 @@ lib/cmyth/Makefile
385 385 /system/profiles.xml
386 386
387 387 # /system/python
388   -/system/python/Lib/
389   -/system/python/python24.zip
390   -/system/python/python24.dll
391   -/system/python/DLLs/_socket.pyd
392   -/system/python/DLLs/pyexpat.pyd
393   -/system/python/DLLs/select.pyd
394   -/system/python/DLLs/unicodedata.pyd
395   -/system/python/DLLs/zlib.pyd
396   -/system/python/DLLs/bz2.pyd
  388 +/system/python/
397 389
398 390 # /system/webserver
399 391 /system/webserver
@@ -496,6 +488,7 @@ lib/cmyth/Makefile
496 488 /xbmc/cores/DllLoader/exports/build_wrapper.sh
497 489 /xbmc/cores/DllLoader/exports/wrapper.def
498 490 /xbmc/cores/DllLoader/Makefile
  491 +
499 492 /xbmc/cores/Makefile
500 493
501 494 /xbmc/cores/VideoRenderers/Makefile
@@ -1029,6 +1022,8 @@ lib/cmyth/Makefile
1029 1022
1030 1023 # /xbmc/interfaces/
1031 1024 /xbmc/interfaces/Makefile
  1025 +/xbmc/interfaces/python/Makefile
  1026 +/xbmc/interfaces/python/xbmcmodule/Makefile
1032 1027 /xbmc/interfaces/python/linux/Makefile
1033 1028 /xbmc/interfaces/python/linux/wrapper_python.def
1034 1029
23 Makefile.in
@@ -120,11 +120,14 @@ LIB_DIRS=\
120 120 lib/libhdhomerun \
121 121 lib/libid3tag \
122 122 lib/libapetag \
123   - xbmc/interfaces/python/linux \
124 123 lib/cpluff \
125 124 lib/xbmc-dll-symbols \
126 125 lib/jsoncpp/src/lib_json
127 126
  127 +ifneq (@USE_EXTERNAL_PYTHON@,1)
  128 +LIB_DIRS+=xbmc/interfaces/python/linux
  129 +endif
  130 +
128 131 SS_DIRS=\
129 132 xbmc/screensavers/rsxs-0.9/xbmc
130 133
@@ -168,6 +171,12 @@ DISTCLEAN_FILES=config.h config.log config.status tools/Linux/xbmc.sh \
168 171 lib/python/libpython2.4.so.1.0 \
169 172 system/libcpluff-@ARCH@.so
170 173
  174 +ifneq (@USE_EXTERNAL_PYTHON@,1)
  175 + PYTHON_TARGET=python
  176 +else
  177 + PYTHON_TARGET=
  178 +endif
  179 +
171 180 all : Makefile externals xbmc.bin xbmc-xrandr skins
172 181
173 182 include Makefile.include
@@ -407,8 +416,10 @@ endif
407 416 libpython: dllloader
408 417 $(MAKE) -C xbmc/interfaces/python
409 418 $(MAKE) -C xbmc/interfaces/python/xbmcmodule
  419 +ifneq (@USE_EXTERNAL_PYTHON@,1)
410 420 python: dllloader
411 421 $(MAKE) -C xbmc/interfaces/python/linux
  422 +endif
412 423 dvdpcodecs: dllloader
413 424 $(MAKE) -C lib
414 425 $(MAKE) -C lib/libdvd
@@ -453,6 +464,12 @@ codecs: papcodecs dvdpcodecs
453 464 libs: cmyth libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so
454 465 externals: codecs libs python visualizations screensavers
455 466
  467 +ifeq ($(findstring osx,@ARCH@), osx)
  468 +libs: libhdhomerun libid3tag imagelib libexif $(PYTHON_TARGET) system/libcpluff-@ARCH@.so system/players/paplayer/libmodplug-@ARCH@.so
  469 +else
  470 +libs: libhdhomerun libid3tag imagelib libexif $(PYTHON_TARGET) system/libcpluff-@ARCH@.so
  471 +endif
  472 +
456 473 xcode_depends: \
457 474 codecs libs python visualizations screensavers eventclients skins \
458 475 lib/libsquish/libsquish.a \
@@ -579,6 +596,10 @@ ifeq ($(findstring arm,@ARCH@), arm)
579 596 LIBS +=-lpython2.6
580 597 endif
581 598
  599 +ifeq (@USE_EXTERNAL_PYTHON@,1)
  600 +LIBS += @PYTHON_LDFLAGS@
  601 +endif
  602 +
582 603 xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC)
583 604 ifeq ($(findstring osx,@ARCH@), osx)
584 605 $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
102 XBMC.xcodeproj/project.pbxproj
@@ -38,7 +38,7 @@
38 38 /* End PBXAggregateTarget section */
39 39
40 40 /* Begin PBXBuildFile section */
41   - 183C454D130C4D55006AA317 /* xbmcvfsmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 189047D11301DEAB00C11012 /* xbmcvfsmodule.cpp */; };
  41 + 183C454D130C4D55006AA317 /* xbmcvfsmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 189047D11301DEAB00C11012 /* xbmcvfsmodule.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
42 42 183FDF8A11AF0B0500B81E9C /* PluginSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 183FDF8811AF0B0500B81E9C /* PluginSource.cpp */; };
43 43 183FDF8B11AF0B0500B81E9C /* PluginSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 183FDF8811AF0B0500B81E9C /* PluginSource.cpp */; };
44 44 184C472F1296BC6E0006DB3E /* Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 184C472D1296BC6E0006DB3E /* Service.cpp */; };
@@ -363,6 +363,7 @@
363 363 18C1D22E13033F6A00CFFE59 /* GLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18C1D22B13033F6A00CFFE59 /* GLUtils.cpp */; };
364 364 18CCEAEE1112F5B800615FC6 /* PCMRemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18CCEAEC1112F5B800615FC6 /* PCMRemap.cpp */; };
365 365 18CCEAEF1112F5B800615FC6 /* PCMRemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18CCEAEC1112F5B800615FC6 /* PCMRemap.cpp */; };
  366 + 384718D81325BA04000486D6 /* XBDateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 384718D61325BA04000486D6 /* XBDateTime.cpp */; };
366 367 431AE5D9109C1A63007428C3 /* OverlayRendererUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 431AE5D7109C1A63007428C3 /* OverlayRendererUtil.cpp */; };
367 368 431AE5DA109C1A63007428C3 /* OverlayRendererUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 431AE5D7109C1A63007428C3 /* OverlayRendererUtil.cpp */; };
368 369 43248C4E0FBE224000B88866 /* LockFree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A72B950FBC8E3B00171871 /* LockFree.cpp */; };
@@ -535,8 +536,8 @@
535 536 7CD2C3AB11940B270009EFC1 /* DirectoryNodeCountry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2C3A811940B270009EFC1 /* DirectoryNodeCountry.cpp */; };
536 537 7CD2CD0111B38B000009EFC1 /* PythonAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CCFE11B38B000009EFC1 /* PythonAddon.cpp */; };
537 538 7CD2CD0211B38B000009EFC1 /* xbmcaddonmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CD0011B38B000009EFC1 /* xbmcaddonmodule.cpp */; };
538   - 7CD2CD0311B38B000009EFC1 /* PythonAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CCFE11B38B000009EFC1 /* PythonAddon.cpp */; };
539   - 7CD2CD0411B38B000009EFC1 /* xbmcaddonmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CD0011B38B000009EFC1 /* xbmcaddonmodule.cpp */; };
  539 + 7CD2CD0311B38B000009EFC1 /* PythonAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CCFE11B38B000009EFC1 /* PythonAddon.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  540 + 7CD2CD0411B38B000009EFC1 /* xbmcaddonmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD2CD0011B38B000009EFC1 /* xbmcaddonmodule.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
540 541 7CDAE9050FFCA3520040B25F /* DVDTSCorrection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CDAE9030FFCA3520040B25F /* DVDTSCorrection.cpp */; };
541 542 7CDAE9060FFCA3520040B25F /* DVDTSCorrection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CDAE9030FFCA3520040B25F /* DVDTSCorrection.cpp */; };
542 543 7CDAEA7D1001CD6E0040B25F /* karaokelyricstextustar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CDAEA7B1001CD6E0040B25F /* karaokelyricstextustar.cpp */; };
@@ -568,10 +569,9 @@
568 569 889B4D8E0E0EF86C00FAD25E /* RSSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 889B4D8C0E0EF86C00FAD25E /* RSSDirectory.cpp */; };
569 570 88ACB01B0DCF40800083CFDF /* ASAPFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88ACB0190DCF40800083CFDF /* ASAPFileDirectory.cpp */; };
570 571 88ACB01F0DCF409E0083CFDF /* ASAPCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88ACB01C0DCF409E0083CFDF /* ASAPCodec.cpp */; };
571   - 88D9FF600DD264B500EDA56F /* XBPythonDllFuncs.S in Sources */ = {isa = PBXBuildFile; fileRef = 88D9FF5F0DD264B500EDA56F /* XBPythonDllFuncs.S */; };
572 572 88ECB6590DE013C4003396A7 /* DiskArbitration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88ECB6580DE013C4003396A7 /* DiskArbitration.framework */; };
573 573 8DD76F790486A8DE00D96B5E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */; };
574   - C80425711158A0DE00D158A6 /* controlslider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80425701158A0DE00D158A6 /* controlslider.cpp */; };
  574 + C80425711158A0DE00D158A6 /* controlslider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80425701158A0DE00D158A6 /* controlslider.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
575 575 C80425721158A0DE00D158A6 /* controlslider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80425701158A0DE00D158A6 /* controlslider.cpp */; };
576 576 C84BF7341349BB74006D6FC9 /* JSONServiceDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C84BF7321349BB74006D6FC9 /* JSONServiceDescription.cpp */; };
577 577 C85EB75C1174614E0008E5A5 /* Repository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C85EB75A1174614E0008E5A5 /* Repository.cpp */; };
@@ -582,7 +582,7 @@
582 582 E33206380D5070AA00435CE3 /* DVDDemuxVobsub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */; };
583 583 E33466A60D2E5103005A65EC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E33466A50D2E5103005A65EC /* IOKit.framework */; };
584 584 E33979960D62FD48004ECDDA /* DVDInputStreamTV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E33979940D62FD47004ECDDA /* DVDInputStreamTV.cpp */; };
585   - E354EF040D99EDC900B55311 /* controlradiobutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E354EF030D99EDC900B55311 /* controlradiobutton.cpp */; };
  585 + E354EF040D99EDC900B55311 /* controlradiobutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E354EF030D99EDC900B55311 /* controlradiobutton.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
586 586 E35EF2550D380C3D00DB5CD5 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E35EF2540D380C3D00DB5CD5 /* QuickTime.framework */; };
587 587 E35EF3240D380E1E00DB5CD5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E35EF3230D380E1E00DB5CD5 /* Carbon.framework */; };
588 588 E36578880D3AA7B40033CC1C /* DVDPlayerCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E36578860D3AA7B40033CC1C /* DVDPlayerCodec.cpp */; };
@@ -689,7 +689,6 @@
689 689 E38E1FF10D25F9FD00618676 /* YUV2RGBShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16710D25F9FA00618676 /* YUV2RGBShader.cpp */; };
690 690 E38E1FF70D25F9FD00618676 /* CueDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E167E0D25F9FA00618676 /* CueDocument.cpp */; };
691 691 E38E1FF80D25F9FD00618676 /* Database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16800D25F9FA00618676 /* Database.cpp */; };
692   - E38E1FF90D25F9FD00618676 /* DateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16820D25F9FA00618676 /* DateTime.cpp */; };
693 692 E38E1FFA0D25F9FD00618676 /* DetectDVDType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16840D25F9FA00618676 /* DetectDVDType.cpp */; };
694 693 E38E1FFB0D25F9FD00618676 /* DNSNameCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16890D25F9FA00618676 /* DNSNameCache.cpp */; };
695 694 E38E1FFC0D25F9FD00618676 /* DynamicDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E168C0D25F9FA00618676 /* DynamicDll.cpp */; };
@@ -858,9 +857,8 @@
858 857 E38E20D60D25F9FD00618676 /* LangCodeExpander.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18560D25F9FA00618676 /* LangCodeExpander.cpp */; };
859 858 E38E20D70D25F9FD00618676 /* LangInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18580D25F9FA00618676 /* LangInfo.cpp */; };
860 859 E38E20D80D25F9FD00618676 /* LastFmManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E185A0D25F9FA00618676 /* LastFmManager.cpp */; };
861   - E38E21600D25F9FD00618676 /* XBPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0D0D25F9FB00618676 /* XBPython.cpp */; };
862   - E38E21610D25F9FD00618676 /* XBPythonDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0F0D25F9FB00618676 /* XBPythonDll.cpp */; };
863   - E38E21620D25F9FD00618676 /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A110D25F9FB00618676 /* XBPyThread.cpp */; };
  860 + E38E21600D25F9FD00618676 /* XBPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0D0D25F9FB00618676 /* XBPython.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  861 + E38E21620D25F9FD00618676 /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A110D25F9FB00618676 /* XBPyThread.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
864 862 E38E21670D25F9FD00618676 /* scrobbler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A250D25F9FB00618676 /* scrobbler.cpp */; };
865 863 E38E21740D25F9FD00618676 /* MediaCrawler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ABD0D25F9FB00618676 /* MediaCrawler.cpp */; };
866 864 E38E21760D25F9FD00618676 /* PltMicroMediaController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AC20D25F9FB00618676 /* PltMicroMediaController.cpp */; };
@@ -1033,37 +1031,37 @@
1033 1031 E38E256D0D263A1C00618676 /* librtv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E256C0D263A1C00618676 /* librtv.a */; };
1034 1032 E38E25780D263BF600618676 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25770D263BF600618676 /* unpack.cpp */; };
1035 1033 E38E257C0D263C4400618676 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257B0D263C4400618676 /* rar.cpp */; };
1036   - E38E259D0D263CE000618676 /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257E0D263CE000618676 /* action.cpp */; };
1037   - E38E259E0D263CE000618676 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257F0D263CE000618676 /* control.cpp */; };
1038   - E38E259F0D263CE000618676 /* controlbutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25800D263CE000618676 /* controlbutton.cpp */; };
1039   - E38E25A00D263CE000618676 /* controlcheckmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25810D263CE000618676 /* controlcheckmark.cpp */; };
1040   - E38E25A10D263CE000618676 /* controlfadelabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25820D263CE000618676 /* controlfadelabel.cpp */; };
1041   - E38E25A20D263CE000618676 /* controlgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25830D263CE000618676 /* controlgroup.cpp */; };
1042   - E38E25A30D263CE000618676 /* controlimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25840D263CE000618676 /* controlimage.cpp */; };
1043   - E38E25A40D263CE000618676 /* controllabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25850D263CE000618676 /* controllabel.cpp */; };
1044   - E38E25A50D263CE000618676 /* controllist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25860D263CE000618676 /* controllist.cpp */; };
1045   - E38E25A60D263CE000618676 /* controlprogress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25870D263CE000618676 /* controlprogress.cpp */; };
1046   - E38E25A70D263CE000618676 /* controlspin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25880D263CE000618676 /* controlspin.cpp */; };
1047   - E38E25A80D263CE000618676 /* controltextbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25890D263CE000618676 /* controltextbox.cpp */; };
1048   - E38E25A90D263CE000618676 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258A0D263CE000618676 /* dialog.cpp */; };
1049   - E38E25AA0D263CE000618676 /* GUIPythonWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258B0D263CE000618676 /* GUIPythonWindow.cpp */; };
1050   - E38E25AB0D263CE000618676 /* GUIPythonWindowDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258C0D263CE000618676 /* GUIPythonWindowDialog.cpp */; };
1051   - E38E25AC0D263CE000618676 /* GUIPythonWindowXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258D0D263CE000618676 /* GUIPythonWindowXML.cpp */; };
1052   - E38E25AD0D263CE000618676 /* GUIPythonWindowXMLDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258E0D263CE000618676 /* GUIPythonWindowXMLDialog.cpp */; };
1053   - E38E25AE0D263CE000618676 /* infotagmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258F0D263CE000618676 /* infotagmusic.cpp */; };
1054   - E38E25AF0D263CE000618676 /* infotagvideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25900D263CE000618676 /* infotagvideo.cpp */; };
1055   - E38E25B00D263CE000618676 /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25910D263CE000618676 /* keyboard.cpp */; };
1056   - E38E25B10D263CE000618676 /* listitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25920D263CE000618676 /* listitem.cpp */; };
1057   - E38E25B20D263CE000618676 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25930D263CE000618676 /* player.cpp */; };
1058   - E38E25B30D263CE000618676 /* pyplaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25940D263CE000618676 /* pyplaylist.cpp */; };
1059   - E38E25B40D263CE000618676 /* PythonPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25950D263CE000618676 /* PythonPlayer.cpp */; };
1060   - E38E25B50D263CE000618676 /* pyutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25960D263CE000618676 /* pyutil.cpp */; };
1061   - E38E25B60D263CE000618676 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25970D263CE000618676 /* window.cpp */; };
1062   - E38E25B70D263CE000618676 /* winxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25980D263CE000618676 /* winxml.cpp */; };
1063   - E38E25B80D263CE000618676 /* winxmldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25990D263CE000618676 /* winxmldialog.cpp */; };
1064   - E38E25B90D263CE000618676 /* xbmcguimodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259A0D263CE000618676 /* xbmcguimodule.cpp */; };
1065   - E38E25BA0D263CE000618676 /* xbmcmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259B0D263CE000618676 /* xbmcmodule.cpp */; };
1066   - E38E25BB0D263CE000618676 /* xbmcplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259C0D263CE000618676 /* xbmcplugin.cpp */; };
  1034 + E38E259D0D263CE000618676 /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257E0D263CE000618676 /* action.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1035 + E38E259E0D263CE000618676 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257F0D263CE000618676 /* control.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1036 + E38E259F0D263CE000618676 /* controlbutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25800D263CE000618676 /* controlbutton.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1037 + E38E25A00D263CE000618676 /* controlcheckmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25810D263CE000618676 /* controlcheckmark.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1038 + E38E25A10D263CE000618676 /* controlfadelabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25820D263CE000618676 /* controlfadelabel.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1039 + E38E25A20D263CE000618676 /* controlgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25830D263CE000618676 /* controlgroup.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1040 + E38E25A30D263CE000618676 /* controlimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25840D263CE000618676 /* controlimage.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1041 + E38E25A40D263CE000618676 /* controllabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25850D263CE000618676 /* controllabel.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1042 + E38E25A50D263CE000618676 /* controllist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25860D263CE000618676 /* controllist.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1043 + E38E25A60D263CE000618676 /* controlprogress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25870D263CE000618676 /* controlprogress.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1044 + E38E25A70D263CE000618676 /* controlspin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25880D263CE000618676 /* controlspin.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1045 + E38E25A80D263CE000618676 /* controltextbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25890D263CE000618676 /* controltextbox.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1046 + E38E25A90D263CE000618676 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258A0D263CE000618676 /* dialog.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1047 + E38E25AA0D263CE000618676 /* GUIPythonWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258B0D263CE000618676 /* GUIPythonWindow.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1048 + E38E25AB0D263CE000618676 /* GUIPythonWindowDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258C0D263CE000618676 /* GUIPythonWindowDialog.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1049 + E38E25AC0D263CE000618676 /* GUIPythonWindowXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258D0D263CE000618676 /* GUIPythonWindowXML.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1050 + E38E25AD0D263CE000618676 /* GUIPythonWindowXMLDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258E0D263CE000618676 /* GUIPythonWindowXMLDialog.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1051 + E38E25AE0D263CE000618676 /* infotagmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E258F0D263CE000618676 /* infotagmusic.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1052 + E38E25AF0D263CE000618676 /* infotagvideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25900D263CE000618676 /* infotagvideo.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1053 + E38E25B00D263CE000618676 /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25910D263CE000618676 /* keyboard.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1054 + E38E25B10D263CE000618676 /* listitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25920D263CE000618676 /* listitem.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1055 + E38E25B20D263CE000618676 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25930D263CE000618676 /* player.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1056 + E38E25B30D263CE000618676 /* pyplaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25940D263CE000618676 /* pyplaylist.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1057 + E38E25B40D263CE000618676 /* PythonPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25950D263CE000618676 /* PythonPlayer.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1058 + E38E25B50D263CE000618676 /* pyutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25960D263CE000618676 /* pyutil.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1059 + E38E25B60D263CE000618676 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25970D263CE000618676 /* window.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1060 + E38E25B70D263CE000618676 /* winxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25980D263CE000618676 /* winxml.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1061 + E38E25B80D263CE000618676 /* winxmldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25990D263CE000618676 /* winxmldialog.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1062 + E38E25B90D263CE000618676 /* xbmcguimodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259A0D263CE000618676 /* xbmcguimodule.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1063 + E38E25BA0D263CE000618676 /* xbmcmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259B0D263CE000618676 /* xbmcmodule.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
  1064 + E38E25BB0D263CE000618676 /* xbmcplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259C0D263CE000618676 /* xbmcplugin.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
1067 1065 E38E25C00D263DC100618676 /* DVDFactoryDemuxer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25BF0D263DC100618676 /* DVDFactoryDemuxer.cpp */; };
1068 1066 E38E25C30D263DE200618676 /* DVDDemuxFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25C20D263DE200618676 /* DVDDemuxFFmpeg.cpp */; };
1069 1067 E38F12C20D29FF200035C331 /* FileShoutcast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38F12C10D29FF200035C331 /* FileShoutcast.cpp */; };
@@ -1300,7 +1298,6 @@
1300 1298 F5A1C9370F6B06CF00A96ABD /* YUV2RGBShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16710D25F9FA00618676 /* YUV2RGBShader.cpp */; };
1301 1299 F5A1C9390F6B06CF00A96ABD /* CueDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E167E0D25F9FA00618676 /* CueDocument.cpp */; };
1302 1300 F5A1C93A0F6B06CF00A96ABD /* Database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16800D25F9FA00618676 /* Database.cpp */; };
1303   - F5A1C93B0F6B06CF00A96ABD /* DateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16820D25F9FA00618676 /* DateTime.cpp */; };
1304 1301 F5A1C93C0F6B06CF00A96ABD /* DetectDVDType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16840D25F9FA00618676 /* DetectDVDType.cpp */; };
1305 1302 F5A1C93D0F6B06CF00A96ABD /* DNSNameCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16890D25F9FA00618676 /* DNSNameCache.cpp */; };
1306 1303 F5A1C93E0F6B06CF00A96ABD /* DynamicDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E168C0D25F9FA00618676 /* DynamicDll.cpp */; };
@@ -1470,7 +1467,6 @@
1470 1467 F5A1C9FA0F6B06CF00A96ABD /* LangInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18580D25F9FA00618676 /* LangInfo.cpp */; };
1471 1468 F5A1C9FB0F6B06CF00A96ABD /* LastFmManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E185A0D25F9FA00618676 /* LastFmManager.cpp */; };
1472 1469 F5A1CA010F6B06CF00A96ABD /* XBPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0D0D25F9FB00618676 /* XBPython.cpp */; };
1473   - F5A1CA020F6B06CF00A96ABD /* XBPythonDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0F0D25F9FB00618676 /* XBPythonDll.cpp */; };
1474 1470 F5A1CA030F6B06CF00A96ABD /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A110D25F9FB00618676 /* XBPyThread.cpp */; };
1475 1471 F5A1CA040F6B06CF00A96ABD /* scrobbler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A250D25F9FB00618676 /* scrobbler.cpp */; };
1476 1472 F5A1CA050F6B06CF00A96ABD /* MediaCrawler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ABD0D25F9FB00618676 /* MediaCrawler.cpp */; };
@@ -1696,7 +1692,6 @@
1696 1692 F5A1CB520F6B06CF00A96ABD /* MusicFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 880DBE530DC224A100E26B71 /* MusicFileDirectory.cpp */; };
1697 1693 F5A1CB530F6B06CF00A96ABD /* ASAPFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88ACB0190DCF40800083CFDF /* ASAPFileDirectory.cpp */; };
1698 1694 F5A1CB540F6B06CF00A96ABD /* ASAPCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88ACB01C0DCF409E0083CFDF /* ASAPCodec.cpp */; };
1699   - F5A1CB560F6B06CF00A96ABD /* XBPythonDllFuncs.S in Sources */ = {isa = PBXBuildFile; fileRef = 88D9FF5F0DD264B500EDA56F /* XBPythonDllFuncs.S */; };
1700 1695 F5A1CB570F6B06CF00A96ABD /* DVDOverlayCodecSSA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8883CE9E0DD817D1004E8B72 /* DVDOverlayCodecSSA.cpp */; };
1701 1696 F5A1CB580F6B06CF00A96ABD /* DVDSubtitleParserSSA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8883CEA30DD81807004E8B72 /* DVDSubtitleParserSSA.cpp */; };
1702 1697 F5A1CB590F6B06CF00A96ABD /* DVDSubtitlesLibass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8883CEA50DD81807004E8B72 /* DVDSubtitlesLibass.cpp */; };
@@ -2255,6 +2250,8 @@
2255 2250 18C1D22C13033F6A00CFFE59 /* GLUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLUtils.h; sourceTree = "<group>"; };
2256 2251 18CCEAEC1112F5B800615FC6 /* PCMRemap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCMRemap.cpp; sourceTree = "<group>"; };
2257 2252 18CCEAED1112F5B800615FC6 /* PCMRemap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PCMRemap.h; sourceTree = "<group>"; };
  2253 + 384718D61325BA04000486D6 /* XBDateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBDateTime.cpp; sourceTree = "<group>"; };
  2254 + 384718D71325BA04000486D6 /* XBDateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBDateTime.h; sourceTree = "<group>"; };
2258 2255 38B2BBD013131B4A00F83309 /* GlobalsHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlobalsHandling.h; sourceTree = "<group>"; };
2259 2256 430C881312D64A730098821A /* IPowerSyscall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IPowerSyscall.h; sourceTree = "<group>"; };
2260 2257 431376FF12D6455C00680C15 /* GUIDialogCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogCache.h; sourceTree = "<group>"; };
@@ -2511,7 +2508,6 @@
2511 2508 88ACB01C0DCF409E0083CFDF /* ASAPCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ASAPCodec.cpp; sourceTree = "<group>"; };
2512 2509 88ACB01D0DCF409E0083CFDF /* ASAPCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASAPCodec.h; sourceTree = "<group>"; };
2513 2510 88ACB01E0DCF409E0083CFDF /* DllASAP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllASAP.h; sourceTree = "<group>"; };
2514   - 88D9FF5F0DD264B500EDA56F /* XBPythonDllFuncs.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = XBPythonDllFuncs.S; sourceTree = "<group>"; };
2515 2511 88ECB6580DE013C4003396A7 /* DiskArbitration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiskArbitration.framework; path = /System/Library/Frameworks/DiskArbitration.framework; sourceTree = "<absolute>"; };
2516 2512 8DD76F7E0486A8DE00D96B5E /* XBMC */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XBMC; sourceTree = BUILT_PRODUCTS_DIR; };
2517 2513 C80425701158A0DE00D158A6 /* controlslider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlslider.cpp; sourceTree = "<group>"; };
@@ -2781,8 +2777,6 @@
2781 2777 E38E167F0D25F9FA00618676 /* CueDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueDocument.h; sourceTree = "<group>"; };
2782 2778 E38E16800D25F9FA00618676 /* Database.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Database.cpp; sourceTree = "<group>"; };
2783 2779 E38E16810D25F9FA00618676 /* Database.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Database.h; sourceTree = "<group>"; };
2784   - E38E16820D25F9FA00618676 /* DateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateTime.cpp; sourceTree = "<group>"; };
2785   - E38E16830D25F9FA00618676 /* DateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateTime.h; sourceTree = "<group>"; };
2786 2780 E38E16840D25F9FA00618676 /* DetectDVDType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DetectDVDType.cpp; sourceTree = "<group>"; };
2787 2781 E38E16850D25F9FA00618676 /* DetectDVDType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetectDVDType.h; sourceTree = "<group>"; };
2788 2782 E38E16860D25F9FA00618676 /* DllImageLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllImageLib.h; sourceTree = "<group>"; };
@@ -3155,7 +3149,6 @@
3155 3149 E38E1A080D25F9FB00618676 /* winxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winxml.h; sourceTree = "<group>"; };
3156 3150 E38E1A0D0D25F9FB00618676 /* XBPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPython.cpp; sourceTree = "<group>"; };
3157 3151 E38E1A0E0D25F9FB00618676 /* XBPython.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPython.h; sourceTree = "<group>"; };
3158   - E38E1A0F0D25F9FB00618676 /* XBPythonDll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPythonDll.cpp; sourceTree = "<group>"; };
3159 3152 E38E1A100D25F9FB00618676 /* XBPythonDll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPythonDll.h; sourceTree = "<group>"; };
3160 3153 E38E1A110D25F9FB00618676 /* XBPyThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPyThread.cpp; sourceTree = "<group>"; };
3161 3154 E38E1A120D25F9FB00618676 /* XBPyThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPyThread.h; sourceTree = "<group>"; };
@@ -5028,8 +5021,6 @@
5028 5021 E38E14730D25F9F900618676 /* BackgroundInfoLoader.h */,
5029 5022 E38E167E0D25F9FA00618676 /* CueDocument.cpp */,
5030 5023 E38E167F0D25F9FA00618676 /* CueDocument.h */,
5031   - E38E16820D25F9FA00618676 /* DateTime.cpp */,
5032   - E38E16830D25F9FA00618676 /* DateTime.h */,
5033 5024 E38E168C0D25F9FA00618676 /* DynamicDll.cpp */,
5034 5025 E38E168D0D25F9FA00618676 /* DynamicDll.h */,
5035 5026 E38E16900D25F9FA00618676 /* Favourites.cpp */,
@@ -5082,6 +5073,8 @@
5082 5073 E38E1E9A0D25F9FD00618676 /* ViewDatabase.h */,
5083 5074 E38E1EA70D25F9FD00618676 /* XBApplicationEx.cpp */,
5084 5075 E38E1EA80D25F9FD00618676 /* XBApplicationEx.h */,
  5076 + 384718D61325BA04000486D6 /* XBDateTime.cpp */,
  5077 + 384718D71325BA04000486D6 /* XBDateTime.h */,
5085 5078 E38E1ED10D25F9FD00618676 /* xbmc.cpp */,
5086 5079 );
5087 5080 path = xbmc;
@@ -5927,11 +5920,9 @@
5927 5920 E38E19820D25F9FB00618676 /* python */ = {
5928 5921 isa = PBXGroup;
5929 5922 children = (
5930   - 88D9FF5F0DD264B500EDA56F /* XBPythonDllFuncs.S */,
5931 5923 E38E19DA0D25F9FB00618676 /* xbmcmodule */,
5932 5924 E38E1A0D0D25F9FB00618676 /* XBPython.cpp */,
5933 5925 E38E1A0E0D25F9FB00618676 /* XBPython.h */,
5934   - E38E1A0F0D25F9FB00618676 /* XBPythonDll.cpp */,
5935 5926 E38E1A100D25F9FB00618676 /* XBPythonDll.h */,
5936 5927 E38E1A110D25F9FB00618676 /* XBPyThread.cpp */,
5937 5928 E38E1A120D25F9FB00618676 /* XBPyThread.h */,
@@ -7361,7 +7352,6 @@
7361 7352 E38E1FF10D25F9FD00618676 /* YUV2RGBShader.cpp in Sources */,
7362 7353 E38E1FF70D25F9FD00618676 /* CueDocument.cpp in Sources */,
7363 7354 E38E1FF80D25F9FD00618676 /* Database.cpp in Sources */,
7364   - E38E1FF90D25F9FD00618676 /* DateTime.cpp in Sources */,
7365 7355 E38E1FFA0D25F9FD00618676 /* DetectDVDType.cpp in Sources */,
7366 7356 E38E1FFB0D25F9FD00618676 /* DNSNameCache.cpp in Sources */,
7367 7357 E38E1FFC0D25F9FD00618676 /* DynamicDll.cpp in Sources */,
@@ -7531,7 +7521,6 @@
7531 7521 E38E20D70D25F9FD00618676 /* LangInfo.cpp in Sources */,
7532 7522 E38E20D80D25F9FD00618676 /* LastFmManager.cpp in Sources */,
7533 7523 E38E21600D25F9FD00618676 /* XBPython.cpp in Sources */,
7534   - E38E21610D25F9FD00618676 /* XBPythonDll.cpp in Sources */,
7535 7524 E38E21620D25F9FD00618676 /* XBPyThread.cpp in Sources */,
7536 7525 E38E21670D25F9FD00618676 /* scrobbler.cpp in Sources */,
7537 7526 E38E21740D25F9FD00618676 /* MediaCrawler.cpp in Sources */,
@@ -7757,7 +7746,6 @@
7757 7746 880DBE550DC224A100E26B71 /* MusicFileDirectory.cpp in Sources */,
7758 7747 88ACB01B0DCF40800083CFDF /* ASAPFileDirectory.cpp in Sources */,
7759 7748 88ACB01F0DCF409E0083CFDF /* ASAPCodec.cpp in Sources */,
7760   - 88D9FF600DD264B500EDA56F /* XBPythonDllFuncs.S in Sources */,
7761 7749 8883CEA10DD817D1004E8B72 /* DVDOverlayCodecSSA.cpp in Sources */,
7762 7750 8883CEA70DD81807004E8B72 /* DVDSubtitleParserSSA.cpp in Sources */,
7763 7751 8883CEA80DD81807004E8B72 /* DVDSubtitlesLibass.cpp in Sources */,
@@ -8149,6 +8137,7 @@
8149 8137 F5AE40A713415D9E0004BD79 /* VideoLibrary.cpp in Sources */,
8150 8138 F5AE40A813415D9E0004BD79 /* XBMCOperations.cpp in Sources */,
8151 8139 C84BF7341349BB74006D6FC9 /* JSONServiceDescription.cpp in Sources */,
  8140 + 384718D81325BA04000486D6 /* XBDateTime.cpp in Sources */,
8152 8141 );
8153 8142 runOnlyForDeploymentPostprocessing = 0;
8154 8143 };
@@ -8252,7 +8241,6 @@
8252 8241 F5A1C9370F6B06CF00A96ABD /* YUV2RGBShader.cpp in Sources */,
8253 8242 F5A1C9390F6B06CF00A96ABD /* CueDocument.cpp in Sources */,
8254 8243 F5A1C93A0F6B06CF00A96ABD /* Database.cpp in Sources */,
8255   - F5A1C93B0F6B06CF00A96ABD /* DateTime.cpp in Sources */,
8256 8244 F5A1C93C0F6B06CF00A96ABD /* DetectDVDType.cpp in Sources */,
8257 8245 F5A1C93D0F6B06CF00A96ABD /* DNSNameCache.cpp in Sources */,
8258 8246 F5A1C93E0F6B06CF00A96ABD /* DynamicDll.cpp in Sources */,
@@ -8422,7 +8410,6 @@
8422 8410 F5A1C9FA0F6B06CF00A96ABD /* LangInfo.cpp in Sources */,
8423 8411 F5A1C9FB0F6B06CF00A96ABD /* LastFmManager.cpp in Sources */,
8424 8412 F5A1CA010F6B06CF00A96ABD /* XBPython.cpp in Sources */,
8425   - F5A1CA020F6B06CF00A96ABD /* XBPythonDll.cpp in Sources */,
8426 8413 F5A1CA030F6B06CF00A96ABD /* XBPyThread.cpp in Sources */,
8427 8414 F5A1CA040F6B06CF00A96ABD /* scrobbler.cpp in Sources */,
8428 8415 F5A1CA050F6B06CF00A96ABD /* MediaCrawler.cpp in Sources */,
@@ -8648,7 +8635,6 @@
8648 8635 F5A1CB520F6B06CF00A96ABD /* MusicFileDirectory.cpp in Sources */,
8649 8636 F5A1CB530F6B06CF00A96ABD /* ASAPFileDirectory.cpp in Sources */,
8650 8637 F5A1CB540F6B06CF00A96ABD /* ASAPCodec.cpp in Sources */,
8651   - F5A1CB560F6B06CF00A96ABD /* XBPythonDllFuncs.S in Sources */,
8652 8638 F5A1CB570F6B06CF00A96ABD /* DVDOverlayCodecSSA.cpp in Sources */,
8653 8639 F5A1CB580F6B06CF00A96ABD /* DVDSubtitleParserSSA.cpp in Sources */,
8654 8640 F5A1CB590F6B06CF00A96ABD /* DVDSubtitlesLibass.cpp in Sources */,
42 configure.in
@@ -5,6 +5,7 @@ AC_PREREQ(2.59)
5 5 AC_INIT([xbmc], [9.11], [http://trac.xbmc.org])
6 6 AC_CONFIG_HEADERS([xbmc/config.h])
7 7 AH_TOP([#pragma once])
  8 +m4_include([m4/ax_python_devel.m4])
8 9
9 10 AC_CONFIG_AUX_DIR([build-aux])
10 11 AM_INIT_AUTOMAKE([foreign])
@@ -891,29 +892,21 @@ fi
891 892
892 893 # External Python
893 894 if test "$use_external_python" = "yes"; then
894   - AC_CHECK_LIB([python2.6], [main],
895   - [AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
896   - [Define to 1 if you have the 'python2.6' library.])
897   - USE_PYTHON2_6=1],
898   - [AC_CHECK_LIB([python2.5], [main],
899   - [AC_DEFINE([HAVE_LIBPYTHON2_5], [1],
900   - [Define to 1 if you have the 'python2.5' library.])
901   - USE_PYTHON2_5=1],
902   - [AC_CHECK_LIB([python2.4], [main],
903   - [AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
904   - [Define to 1 if you have the 'python2.4' library.])
905   - USE_PYTHON2_4=1],
906   - [AC_MSG_ERROR($missing_library)] )] )] )
907   -
908   - AC_MSG_NOTICE($external_python_enabled)
909   - test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
910   - test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
911   - test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
912   - USE_EXTERNAL_PYTHON=1
913   - AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.])
  895 + AX_PYTHON_DEVEL([>= 2.4])
  896 + PYTHON_VERSION=$ac_python_version
  897 +
  898 + if test -z "$PYTHON_VERSION"; then
  899 + AC_MSG_NOTICE($external_python_disabled)
  900 + USE_EXTERNAL_PYTHON=0
  901 + else
  902 + AC_MSG_NOTICE($external_python_enabled)
  903 + AC_MSG_NOTICE([Using Python $PYTHON_VERSION])
  904 + USE_EXTERNAL_PYTHON=1
  905 + AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.])
  906 + fi
914 907 else
915   - AC_MSG_NOTICE($external_python_disabled)
916 908 USE_EXTERNAL_PYTHON=0
  909 + PYTHON_CPPFLAGS="-I\$(abs_top_srcdir)/lib/python/Include"
917 910 fi
918 911
919 912 # VDPAU
@@ -1401,7 +1394,8 @@ OUTPUT_FILES="Makefile \
1401 1394 lib/libsquish/Makefile \
1402 1395 lib/libid3tag/Makefile \
1403 1396 lib/cximage-6.0/Makefile \
1404   - xbmc/interfaces/python/linux/Makefile \
  1397 + xbmc/interfaces/python/Makefile \
  1398 + xbmc/interfaces/python/xbmcmodule/Makefile \
1405 1399 lib/libUPnP/Makefile \
1406 1400 xbmc/DllPaths_generated.h \
1407 1401 xbmc/linux/Makefile \
@@ -1434,9 +1428,7 @@ AC_SUBST(BUILD_DVDCSS)
1434 1428 AC_SUBST(BUILD_GOOM)
1435 1429 AC_SUBST(USE_EXTERNAL_FFMPEG)
1436 1430 AC_SUBST(USE_EXTERNAL_PYTHON)
1437   -AC_SUBST(USE_PYTHON2_6)
1438   -AC_SUBST(USE_PYTHON2_5)
1439   -AC_SUBST(USE_PYTHON2_4)
  1431 +AC_SUBST(PYTHON_VERSION)
1440 1432 AC_SUBST(OUTPUT_FILES)
1441 1433 AC_SUBST(HAVE_XBMC_NONFREE)
1442 1434 AC_SUBST(USE_ASAP_CODEC)
333 m4/ax_python_devel.m4
... ... @@ -0,0 +1,333 @@
  1 +# ===========================================================================
  2 +# http://www.gnu.org/software/autoconf-archive/ax_python_devel.html
  3 +# ===========================================================================
  4 +#
  5 +# SYNOPSIS
  6 +#
  7 +# AX_PYTHON_DEVEL([version])
  8 +#
  9 +# DESCRIPTION
  10 +#
  11 +# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
  12 +# in your configure.ac.
  13 +#
  14 +# This macro checks for Python and tries to get the include path to
  15 +# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
  16 +# output variables. It also exports $(PYTHON_EXTRA_LIBS) and
  17 +# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
  18 +#
  19 +# You can search for some particular version of Python by passing a
  20 +# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please
  21 +# note that you *have* to pass also an operator along with the version to
  22 +# match, and pay special attention to the single quotes surrounding the
  23 +# version number. Don't use "PYTHON_VERSION" for this: that environment
  24 +# variable is declared as precious and thus reserved for the end-user.
  25 +#
  26 +# This macro should work for all versions of Python >= 2.1.0. As an end
  27 +# user, you can disable the check for the python version by setting the
  28 +# PYTHON_NOVERSIONCHECK environment variable to something else than the
  29 +# empty string.
  30 +#
  31 +# If you need to use this macro for an older Python version, please
  32 +# contact the authors. We're always open for feedback.
  33 +#
  34 +# LICENSE
  35 +#
  36 +# Copyright (c) 2009 Sebastian Huber <sebastian-huber@web.de>
  37 +# Copyright (c) 2009 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
  38 +# Copyright (c) 2009 Rafael Laboissiere <rafael@laboissiere.net>
  39 +# Copyright (c) 2009 Andrew Collier <colliera@ukzn.ac.za>
  40 +# Copyright (c) 2009 Matteo Settenvini <matteo@member.fsf.org>
  41 +# Copyright (c) 2009 Horst Knorr <hk_classes@knoda.org>
  42 +#
  43 +# This program is free software: you can redistribute it and/or modify it
  44 +# under the terms of the GNU General Public License as published by the
  45 +# Free Software Foundation, either version 3 of the License, or (at your
  46 +# option) any later version.
  47 +#
  48 +# This program is distributed in the hope that it will be useful, but
  49 +# WITHOUT ANY WARRANTY; without even the implied warranty of
  50 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
  51 +# Public License for more details.
  52 +#
  53 +# You should have received a copy of the GNU General Public License along
  54 +# with this program. If not, see <http://www.gnu.org/licenses/>.
  55 +#
  56 +# As a special exception, the respective Autoconf Macro's copyright owner
  57 +# gives unlimited permission to copy, distribute and modify the configure
  58 +# scripts that are the output of Autoconf when processing the Macro. You
  59 +# need not follow the terms of the GNU General Public License when using
  60 +# or distributing such scripts, even though portions of the text of the
  61 +# Macro appear in them. The GNU General Public License (GPL) does govern
  62 +# all other use of the material that constitutes the Autoconf Macro.
  63 +#
  64 +# This special exception to the GPL applies to versions of the Autoconf
  65 +# Macro released by the Autoconf Archive. When you make and distribute a
  66 +# modified version of the Autoconf Macro, you may extend this special
  67 +# exception to the GPL to apply to your modified version as well.
  68 +
  69 +#serial 8
  70 +
  71 +AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
  72 +AC_DEFUN([AX_PYTHON_DEVEL],[
  73 + #
  74 + # Allow the use of a (user set) custom python version
  75 + #
  76 + AC_ARG_VAR([PYTHON_VERSION],[The installed Python
  77 + version to use, for example '2.3'. This string
  78 + will be appended to the Python interpreter
  79 + canonical name.])
  80 +
  81 + AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
  82 + if test -z "$PYTHON"; then
  83 + AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
  84 + PYTHON_VERSION=""
  85 + fi
  86 +
  87 + #
  88 + # Check for a version of Python >= 2.1.0
  89 + #
  90 + AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
  91 + ac_supports_python_ver=`$PYTHON -c "import sys; \
  92 + ver = sys.version.split ()[[0]]; \
  93 + print (ver >= '2.1.0')"`
  94 + if test "$ac_supports_python_ver" != "True"; then
  95 + if test -z "$PYTHON_NOVERSIONCHECK"; then
  96 + AC_MSG_RESULT([no])
  97 + AC_MSG_FAILURE([
  98 +This version of the AC@&t@_PYTHON_DEVEL macro
  99 +doesn't work properly with versions of Python before
  100 +2.1.0. You may need to re-run configure, setting the
  101 +variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
  102 +PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
  103 +Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
  104 +to something else than an empty string.
  105 +])
  106 + else
  107 + AC_MSG_RESULT([skip at user request])
  108 + fi
  109 + else
  110 + AC_MSG_RESULT([yes])
  111 + fi
  112 +
  113 + #
  114 + # if the macro parameter ``version'' is set, honour it
  115 + #
  116 + if test -n "$1"; then
  117 + AC_MSG_CHECKING([for a version of Python $1])
  118 + ac_supports_python_ver=`$PYTHON -c "import sys; \
  119 + ver = sys.version.split ()[[0]]; \
  120 + print (ver $1)"`
  121 + if test "$ac_supports_python_ver" = "True"; then
  122 + AC_MSG_RESULT([yes])
  123 + else
  124 + AC_MSG_RESULT([no])
  125 + AC_MSG_ERROR([this package requires Python $1.
  126 +If you have it installed, but it isn't the default Python
  127 +interpreter in your system path, please pass the PYTHON_VERSION
  128 +variable to configure. See ``configure --help'' for reference.
  129 +])
  130 + PYTHON_VERSION=""
  131 + fi
  132 + fi
  133 +
  134 + #
  135 + # Check if you have distutils, else fail
  136 + #
  137 + AC_MSG_CHECKING([for the distutils Python package])
  138 + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
  139 + if test -z "$ac_distutils_result"; then
  140 + AC_MSG_RESULT([yes])
  141 + else
  142 + AC_MSG_RESULT([no])
  143 + AC_MSG_ERROR([cannot import Python module "distutils".
  144 +Please check your Python installation. The error was:
  145 +$ac_distutils_result])
  146 + PYTHON_VERSION=""
  147 + fi
  148 +
  149 + #
  150 + # Check for Python include path
  151 + #
  152 + AC_MSG_CHECKING([for Python include path])
  153 + if test -z "$PYTHON_CPPFLAGS"; then
  154 + python_path=`$PYTHON -c "import distutils.sysconfig; \
  155 + print (distutils.sysconfig.get_python_inc ());"`
  156 + if test -n "${python_path}"; then
  157 + python_path="-I$python_path"
  158 + fi
  159 + PYTHON_CPPFLAGS=$python_path
  160 + fi
  161 + AC_MSG_RESULT([$PYTHON_CPPFLAGS])
  162 + AC_SUBST([PYTHON_CPPFLAGS])
  163 +
  164 + #
  165 + # Check for Python library path
  166 + #
  167 + AC_MSG_CHECKING([for Python library path])
  168 + if test -z "$PYTHON_LDFLAGS"; then
  169 + # (makes two attempts to ensure we've got a version number
  170 + # from the interpreter)
  171 + ac_python_version=`cat<<EOD | $PYTHON -
  172 +
  173 +# join all versioning strings, on some systems
  174 +# major/minor numbers could be in different list elements
  175 +from distutils.sysconfig import *
  176 +ret = ''
  177 +for e in get_config_vars ('VERSION'):
  178 + if (e != None):
  179 + ret += e
  180 +print (ret)
  181 +EOD`
  182 +
  183 + if test -z "$ac_python_version"; then
  184 + if test -n "$PYTHON_VERSION"; then
  185 + ac_python_version=$PYTHON_VERSION
  186 + else
  187 + ac_python_version=`$PYTHON -c "import sys; \
  188 + print (sys.version[[:3]])"`
  189 + fi
  190 + fi
  191 +
  192 + # Make the versioning information available to the compiler
  193 + AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
  194 + [If available, contains the Python version number currently in use.])
  195 +
  196 + # First, the library directory:
  197 + ac_python_libdir=`cat<<EOD | $PYTHON -
  198 +
  199 +# There should be only one
  200 +import distutils.sysconfig
  201 +for e in distutils.sysconfig.get_config_vars ('LIBDIR'):
  202 + if e != None:
  203 + print (e)
  204 + break
  205 +EOD`
  206 +
  207 + # Before checking for libpythonX.Y, we need to know
  208 + # the extension the OS we're on uses for libraries
  209 + # (we take the first one, if there's more than one fix me!):
  210 + ac_python_soext=`$PYTHON -c \
  211 + "import distutils.sysconfig; \
  212 + print (distutils.sysconfig.get_config_vars('SO')[[0]])"`
  213 +
  214 + # Now, for the library:
  215 + ac_python_soname=`$PYTHON -c \
  216 + "import distutils.sysconfig; \
  217 + print (distutils.sysconfig.get_config_vars('LDLIBRARY')[[0]])"`
  218 +
  219 + # If we're on OS X and this is a .dylib then the distutils will
  220 + # identify the .so extension incorrectly. So we check if the
  221 + # the extension is .dylib
  222 + PYTHON_LIB_IS_NOT_OSX_DYLIB=`echo "$ac_python_soname" | sed "s/^.*\.dylib$//"`
  223 + if test -z "$PYTHON_LIB_IS_NOT_OSX_DYLIB"; then
  224 + ac_python_soext=".dylib"
  225 + fi
  226 +
  227 + # Strip away extension from the end to canonicalize its name:
  228 + ac_python_library=`echo "$ac_python_soname" | sed "s/${ac_python_soext}$//"`
  229 +
  230 + # This small piece shamelessly adapted from PostgreSQL python macro;
  231 + # credits goes to momjian, I think. I'd like to put the right name
  232 + # in the credits, if someone can point me in the right direction... ?
  233 + #
  234 + if test -n "$ac_python_libdir" -a -n "$ac_python_library" \
  235 + -a x"$ac_python_library" != x"$ac_python_soname"
  236 + then
  237 + # use the official shared library
  238 + ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
  239 + PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
  240 + else
  241 + # old way: use libpython from python_configdir
  242 + ac_python_libdir=`$PYTHON -c \
  243 + "from distutils.sysconfig import get_python_lib as f; \
  244 + import os; \
  245 + print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
  246 + PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
  247 + fi
  248 +
  249 + if test -z "$PYTHON_LDFLAGS"; then
  250 + AC_MSG_ERROR([
  251 + Cannot determine location of your Python DSO. Please check it was installed with
  252 + dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
  253 + ])
  254 + fi
  255 + fi
  256 + AC_MSG_RESULT([$PYTHON_LDFLAGS])
  257 + AC_SUBST([PYTHON_LDFLAGS])
  258 +
  259 + #
  260 + # Check for site packages
  261 + #
  262 + AC_MSG_CHECKING([for Python site-packages path])
  263 + if test -z "$PYTHON_SITE_PKG"; then
  264 + PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
  265 + print (distutils.sysconfig.get_python_lib(0,0));"`
  266 + fi
  267 + AC_MSG_RESULT([$PYTHON_SITE_PKG])
  268 + AC_SUBST([PYTHON_SITE_PKG])
  269 +
  270 + #
  271 + # libraries which must be linked in when embedding
  272 + #
  273 + AC_MSG_CHECKING(python extra libraries)
  274 + if test -z "$PYTHON_EXTRA_LIBS"; then
  275 + PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
  276 + conf = distutils.sysconfig.get_config_var; \
  277 + print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"`
  278 + fi
  279 + AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
  280 + AC_SUBST(PYTHON_EXTRA_LIBS)
  281 +
  282 + #
  283 + # linking flags needed when embedding
  284 + #
  285 + AC_MSG_CHECKING(python extra linking flags)
  286 + if test -z "$PYTHON_EXTRA_LDFLAGS"; then
  287 + PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
  288 + conf = distutils.sysconfig.get_config_var; \
  289 + print (conf('LINKFORSHARED'))"`
  290 + fi
  291 + AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
  292 + AC_SUBST(PYTHON_EXTRA_LDFLAGS)
  293 +
  294 + #
  295 + # final check to see if everything compiles alright
  296 + #
  297 + AC_MSG_CHECKING([consistency of all components of python development environment])
  298 + # save current global flags
  299 + ac_save_LIBS="$LIBS"
  300 + ac_save_CPPFLAGS="$CPPFLAGS"
  301 + LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
  302 + CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
  303 + AC_LANG_PUSH([C])
  304 + AC_LINK_IFELSE([
  305 + AC_LANG_PROGRAM([[#include <Python.h>]],
  306 + [[Py_Initialize();]])
  307 + ],[pythonexists=yes],[pythonexists=no])
  308 + AC_LANG_POP([C])
  309 + # turn back to default flags
  310 + CPPFLAGS="$ac_save_CPPFLAGS"
  311 + LIBS="$ac_save_LIBS"
  312 +
  313 + AC_MSG_RESULT([$pythonexists])
  314 +
  315 + if test ! "x$pythonexists" = "xyes"; then
  316 + AC_MSG_FAILURE([
  317 + Could not link test program to Python. Maybe the main Python library has been
  318 + installed in some non-standard library path. If so, pass it to configure,
  319 + via the LDFLAGS environment variable.
  320 + Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
  321 + ============================================================================
  322 + ERROR!
  323 + You probably have to install the development version of the Python package
  324 + for your distribution. The exact name of this package varies among them.
  325 + ============================================================================
  326 + ])
  327 + PYTHON_VERSION=""
  328 + fi
  329 +
  330 + #
  331 + # all done!
  332 + #
  333 +])
9 project/VS2010Express/XBMC.vcxproj
... ... @@ -1,4 +1,4 @@
1   -<?xml version="1.0" encoding="utf-8"?>
  1 +<?xml version="1.0" encoding="utf-8"?>
2 2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3 <ItemGroup Label="ProjectConfigurations">
4 4 <ProjectConfiguration Include="Debug (DirectX)|Win32">
@@ -147,7 +147,7 @@
147 147 <ClCompile>
148 148 <Optimization>Disabled</Optimization>
149 149 <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\win32\;..\..\xbmc\cores\dvdplayer;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\Python\PC;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
150   - <PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;Py_NO_ENABLE_SHARED;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  150 + <PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;Py_NO_ENABLE_SHARED;USE_EXTERNAL_PYTHON;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
151 151 <MinimalRebuild>true</MinimalRebuild>
152 152 <ExceptionHandling>Async</ExceptionHandling>
153 153 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -303,7 +303,6 @@
303 303 <ClCompile Include="..\..\xbmc\cores\VideoRenderers\RenderCapture.cpp" />
304 304 <ClCompile Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\WinVideoFilter.cpp" />
305 305 <ClCompile Include="..\..\xbmc\CueDocument.cpp" />
306   - <ClCompile Include="..\..\xbmc\DateTime.cpp" />
307 306 <ClCompile Include="..\..\xbmc\dbwrappers\Database.cpp" />
308 307 <ClCompile Include="..\..\xbmc\dbwrappers\dataset.cpp" />
309 308 <ClCompile Include="..\..\xbmc\dbwrappers\mysqldataset.cpp" />
@@ -739,7 +738,6 @@
739 738 <ClCompile Include="..\..\xbmc\win32\strverscmp.cpp" />
740 739 <ClCompile Include="..\..\xbmc\win32\Win32DelayedDllLoad.cpp" />
741 740 <ClCompile Include="..\..\xbmc\win32\WIN32Util.cpp" />
742   - <ClCompile Include="..\..\xbmc\win32\WIN32XBPythonDll.cpp" />
743 741 <ClCompile Include="..\..\xbmc\win32\WINDirectSound.cpp" />
744 742 <ClCompile Include="..\..\xbmc\win32\WindowHelper.cpp" />
745 743 <ClCompile Include="..\..\xbmc\win32\WINFileSMB.cpp" />
@@ -1079,6 +1077,7 @@
1079 1077 <ClCompile Include="..\..\xbmc\windows\GUIWindowSystemInfo.cpp" />
1080 1078 <ClCompile Include="..\..\xbmc\windows\GUIWindowWeather.cpp" />
1081 1079 <ClCompile Include="..\..\xbmc\XBApplicationEx.cpp" />
  1080 + <ClCompile Include="..\..\xbmc\XBDateTime.cpp" />
1082 1081 <ClCompile Include="..\..\xbmc\xbmc.cpp" />
1083 1082 </ItemGroup>
1084 1083 <ItemGroup>
@@ -1106,7 +1105,6 @@
1106 1105 <ClInclude Include="..\..\xbmc\cores\VideoRenderers\RenderCapture.h" />
1107 1106 <ClInclude Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\WinVideoFilter.h" />
1108 1107 <ClInclude Include="..\..\xbmc\CueDocument.h" />
1109   - <ClInclude Include="..\..\xbmc\DateTime.h" />
1110 1108 <ClInclude Include="..\..\xbmc\dbwrappers\Database.h" />
1111 1109 <ClInclude Include="..\..\xbmc\dbwrappers\dataset.h" />
1112 1110 <ClInclude Include="..\..\xbmc\dbwrappers\mysqldataset.h" />
@@ -1565,6 +1563,7 @@
1565 1563 <ClInclude Include="..\..\xbmc\ViewState.h" />
1566 1564 <ClInclude Include="..\..\xbmc\win32\pch.h" />
1567 1565 <ClInclude Include="..\..\xbmc\win32\PlatformDefs.h" />
  1566 + <ClInclude Include="..\..\xbmc\XBDateTime.h" />
1568 1567 <CustomBuild Include="..\..\xbmc\win32\PlatformInclude.h">
1569 1568 <Command Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">update_git_rev.bat</Command>
1570 1569 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">..\..\xbmc\win32\git_rev.h;%(Outputs)</Outputs>
23 project/VS2010Express/XBMC.vcxproj.filters
... ... @@ -1,4 +1,4 @@
1   -<?xml version="1.0" encoding="utf-8"?>
  1 +<?xml version="1.0" encoding="utf-8"?>
2 2 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3 <ItemGroup>
4 4 <Filter Include="win32">
@@ -1529,9 +1529,6 @@
1529 1529 <ClCompile Include="..\..\xbmc\interfaces\python\XBPyThread.cpp">
1530 1530 <Filter>interfaces\python</Filter>
1531 1531 </ClCompile>
1532   - <ClCompile Include="..\..\xbmc\win32\WIN32XBPythonDll.cpp">
1533   - <Filter>interfaces\python</Filter>
1534   - </ClCompile>
1535 1532 <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicInfo.cpp">
1536 1533 <Filter>music\dialogs</Filter>
1537 1534 </ClCompile>
@@ -2303,9 +2300,6 @@
2303 2300 <ClCompile Include="..\..\xbmc\CueDocument.cpp">
2304 2301 <Filter>utils</Filter>
2305 2302 </ClCompile>
2306   - <ClCompile Include="..\..\xbmc\DateTime.cpp">
2307   - <Filter>utils</Filter>
2308   - </ClCompile>
2309 2303 <ClCompile Include="..\..\xbmc\DynamicDll.cpp">
2310 2304 <Filter>utils</Filter>
2311 2305 </ClCompile>
@@ -2457,6 +2451,9 @@
2457 2451 <ClCompile Include="..\..\xbmc\interfaces\json-rpc\JSONServiceDescription.cpp">
2458 2452 <Filter>interfaces\json-rpc</Filter>
2459 2453 </ClCompile>
  2454 + <ClCompile Include="..\..\xbmc\XBDateTime.cpp">
  2455 + <Filter>utils</Filter>
  2456 + </ClCompile>
2460 2457 </ItemGroup>
2461 2458 <ItemGroup>
2462 2459 <ClInclude Include="..\..\xbmc\win32\pch.h">
@@ -3967,9 +3964,6 @@
3967 3964 <ClInclude Include="..\..\xbmc\interfaces\python\XBPython.h">
3968 3965 <Filter>interfaces\python</Filter>
3969 3966 </ClInclude>
3970   - <ClInclude Include="..\..\xbmc\interfaces\python\XBPythonDll.h">
3971   - <Filter>interfaces\python</Filter>
3972   - </ClInclude>
3973 3967 <ClInclude Include="..\..\xbmc\interfaces\python\XBPyThread.h">
3974 3968 <Filter>interfaces\python</Filter>
3975 3969 </ClInclude>
@@ -4744,9 +4738,6 @@
4744 4738 <ClInclude Include="..\..\xbmc\CueDocument.h">
4745 4739 <Filter>utils</Filter>
4746 4740 </ClInclude>
4747   - <ClInclude Include="..\..\xbmc\DateTime.h">
4748   - <Filter>utils</Filter>
4749   - </ClInclude>
4750 4741 <ClInclude Include="..\..\xbmc\DynamicDll.h">
4751 4742 <Filter>utils</Filter>
4752 4743 </ClInclude>
@@ -4915,6 +4906,12 @@
4915 4906 <ClInclude Include="..\..\xbmc\interfaces\json-rpc\ServiceDescription.h">
4916 4907 <Filter>interfaces\json-rpc</Filter>
4917 4908 </ClInclude>
  4909 + <ClInclude Include="..\..\xbmc\interfaces\python\XBPythonDll.h">
  4910 + <Filter>interfaces\python</Filter>
  4911 + </ClInclude>
  4912 + <ClInclude Include="..\..\xbmc\XBDateTime.h">
  4913 + <Filter>utils</Filter>
  4914 + </ClInclude>
4918 4915 </ItemGroup>
4919 4916 <ItemGroup>
4920 4917 <None Include="..\..\xbmc\win32\XBMC.ico">
3  tools/osx/osx-depends/xbmc/Makefile
@@ -7,7 +7,8 @@ SOURCE=../../../../
7 7 # configuration settings
8 8 CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \
9 9 --enable-external-python \
10   - PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig
  10 + PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \
  11 + PYTHON=$(PREFIX)/bin/python
11 12
12 13 all: configure
13 14
2  xbmc/FileItem.h
@@ -28,7 +28,7 @@
28 28 #include "guilib/GUIListItem.h"
29 29 #include "utils/Archive.h"
30 30 #include "utils/ISerializable.h"
31   -#include "DateTime.h"
  31 +#include "XBDateTime.h"
32 32 #include "SortFileItem.h"
33 33 #include "utils/LabelFormatter.h"
34 34 #include "GUIPassword.h"
2  xbmc/GUIInfoManager.h
@@ -31,7 +31,7 @@
31 31 #include "threads/CriticalSection.h"
32 32 #include "guilib/IMsgTargetCallback.h"
33 33 #include "inttypes.h"
34   -#include "DateTime.h"
  34 +#include "XBDateTime.h"
35 35
36 36 #include <list>
37 37 #include <map>
2  xbmc/Makefile.in
@@ -4,7 +4,6 @@ SRCS=Application.cpp \
4 4 AutoSwitch.cpp \
5 5 BackgroundInfoLoader.cpp \
6 6 CueDocument.cpp \
7   - DateTime.cpp \
8 7 DynamicDll.cpp \
9 8 Favourites.cpp \
10 9 FileItem.cpp \
@@ -31,6 +30,7 @@ SRCS=Application.cpp \
31 30 Util.cpp \
32 31 ViewDatabase.cpp \
33 32 XBApplicationEx.cpp \
  33 + XBDateTime.cpp \
34 34 xbmc.cpp \
35 35
36 36 LIB=xbmc.a
2  xbmc/TextureDatabase.cpp
@@ -22,7 +22,7 @@
22 22 #include "TextureDatabase.h"
23 23 #include "utils/log.h"
24 24 #include "utils/Crc32.h"
25   -#include "DateTime.h"
  25 +#include "XBDateTime.h"
26 26 #include "dbwrappers/dataset.h"
27 27
28 28 CTextureDatabase::CTextureDatabase()
2  xbmc/DateTime.cpp → xbmc/XBDateTime.cpp
@@ -19,7 +19,7 @@
19 19 *
20 20 */
21 21
22   -#include "DateTime.h"
  22 +#include "XBDateTime.h"
23 23 #include "LangInfo.h"
24 24 #include "guilib/LocalizeStrings.h"
25 25
0  xbmc/DateTime.h → xbmc/XBDateTime.h
File renamed without changes
2  xbmc/addons/AddonDatabase.cpp
@@ -22,7 +22,7 @@
22 22 #include "AddonDatabase.h"
23 23 #include "addons/AddonManager.h"
24 24 #include "utils/log.h"
25   -#include "DateTime.h"
  25 +#include "XBDateTime.h"
26 26 #include "addons/Service.h"
27 27 #include "dbwrappers/dataset.h"
28 28
2  xbmc/addons/Repository.h
@@ -22,7 +22,7 @@
22 22
23 23 #include "Addon.h"
24 24 #include "AddonManager.h"
25   -#include "DateTime.h"
  25 +#include "XBDateTime.h"
26 26 #include "URL.h"
27 27 #include "utils/Job.h"
28 28 #include "threads/CriticalSection.h"
2  xbmc/addons/Scraper.h
@@ -20,7 +20,7 @@
20 20 *
21 21 */
22 22 #include "addons/Addon.h"
23   -#include "DateTime.h"
  23 +#include "XBDateTime.h"
24 24 #include "utils/ScraperParser.h"
25 25
26 26 typedef enum
2  xbmc/dialogs/GUIDialogSeekBar.h
@@ -22,7 +22,7 @@
22 22 */
23 23
24 24 #include "guilib/GUIDialog.h"
25   -#include "DateTime.h"
  25 +#include "XBDateTime.h"
26 26
27 27 class CGUIDialogSeekBar : public CGUIDialog
28 28 {
2  xbmc/filesystem/MythDirectory.h
@@ -22,7 +22,7 @@
22 22
23 23 #include "IDirectory.h"
24 24 #include "MythSession.h"
25   -#include "DateTime.h"
  25 +#include "XBDateTime.h"
26 26
27 27 namespace XFILE
28 28 {
2  xbmc/filesystem/MythFile.cpp
@@ -20,7 +20,7 @@
20 20 */
21 21
22 22 #include "MythFile.h"
23   -#include "DateTime.h"
  23 +#include "XBDateTime.h"
24 24 #include "FileItem.h"
25 25 #include "utils/URIUtils.h"
26 26 #include "DllLibCMyth.h"
2  xbmc/filesystem/MythFile.h
@@ -23,7 +23,7 @@
23 23 #include "IFile.h"
24 24 #include "ILiveTV.h"
25 25 #include "MythSession.h"
26   -#include "DateTime.h"
  26 +#include "XBDateTime.h"
27 27 #include "video/VideoInfoTag.h"
28 28 #include <queue>
29 29
2  xbmc/filesystem/MythSession.cpp
@@ -23,7 +23,7 @@
23 23 #include "MythSession.h"
24 24 #include "video/VideoInfoTag.h"
25 25 #include "settings/AdvancedSettings.h"
26   -#include "DateTime.h"
  26 +#include "XBDateTime.h"
27 27 #include "FileItem.h"
28 28 #include "URL.h"
29 29 #include "utils/URIUtils.h"
2  xbmc/guilib/GUIEditControl.cpp
@@ -25,7 +25,7 @@
25 25 #include "dialogs/GUIDialogKeyboard.h"
26 26 #include "dialogs/GUIDialogNumeric.h"
27 27 #include "LocalizeStrings.h"
28   -#include "DateTime.h"
  28 +#include "XBDateTime.h"
29 29 #include "utils/md5.h"
30 30
31 31 #ifdef __APPLE__
9 xbmc/interfaces/python/Makefile