@@ -, +, @@ --- configure.in | 10 ++++++- xbmc/lib/libPython/XBPyThread.cpp | 5 +++- xbmc/lib/libPython/XBPyThread.h | 4 ++- xbmc/lib/libPython/XBPython.cpp | 24 +++++++++++++++----- xbmc/lib/libPython/XBPythonDll.cpp | 4 ++- xbmc/lib/libPython/XBPythonDllFuncs.S | 4 ++- xbmc/lib/libPython/linux/Makefile.in | 5 +++- xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h | 4 ++- xbmc/lib/libPython/xbmcmodule/PythonAddon.h | 4 ++- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h | 4 ++- xbmc/lib/libPython/xbmcmodule/action.h | 4 ++- xbmc/lib/libPython/xbmcmodule/control.h | 4 ++- xbmc/lib/libPython/xbmcmodule/controlbutton.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlgroup.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlimage.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controllabel.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controllist.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlprogress.cpp | 4 ++- .../libPython/xbmcmodule/controlradiobutton.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlslider.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlspin.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controltextbox.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/dialog.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/dialog.h | 4 ++- xbmc/lib/libPython/xbmcmodule/infotagmusic.h | 4 ++- xbmc/lib/libPython/xbmcmodule/infotagvideo.h | 4 ++- xbmc/lib/libPython/xbmcmodule/keyboard.h | 4 ++- xbmc/lib/libPython/xbmcmodule/listitem.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/listitem.h | 4 ++- xbmc/lib/libPython/xbmcmodule/player.h | 4 ++- xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/pyplaylist.h | 4 ++- xbmc/lib/libPython/xbmcmodule/pyutil.h | 4 ++- xbmc/lib/libPython/xbmcmodule/window.h | 4 ++- xbmc/lib/libPython/xbmcmodule/winxml.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/winxml.h | 4 ++- xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp | 5 +++- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp | 4 ++- 42 files changed, 149 insertions(+), 48 deletions(-) --- a/configure.in +++ a/configure.in @@ -901,7 +901,11 @@ fi # External Python if test "$use_external_python" = "yes"; then - AC_CHECK_LIB([python2.6], [main], + AC_CHECK_LIB([python2.7], [main], + [AC_DEFINE([HAVE_LIBPYTHON2_7], [1], + [Define to 1 if you have the 'python2.7' library.]) + USE_PYTHON2_7=1], + [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], @@ -913,9 +917,10 @@ if test "$use_external_python" = "yes"; then [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_ERROR($missing_library)] )] )] )] ) AC_MSG_NOTICE($external_python_enabled) + test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7]) 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]) @@ -1471,6 +1476,7 @@ AC_SUBST(USE_INTERNAL_LIBDTS) AC_SUBST(USE_EXTERNAL_LIBMPEG2) AC_SUBST(USE_EXTERNAL_LIBWAVPACK) AC_SUBST(USE_EXTERNAL_PYTHON) +AC_SUBST(USE_PYTHON2_7) AC_SUBST(USE_PYTHON2_6) AC_SUBST(USE_PYTHON2_5) AC_SUBST(USE_PYTHON2_4) --- a/xbmc/lib/libPython/XBPyThread.cpp +++ a/xbmc/lib/libPython/XBPyThread.cpp @@ -24,7 +24,10 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #include #elif (defined HAVE_LIBPYTHON2_5) --- a/xbmc/lib/libPython/XBPyThread.h +++ a/xbmc/lib/libPython/XBPyThread.h @@ -26,7 +26,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/XBPython.cpp +++ a/xbmc/lib/libPython/XBPython.cpp @@ -24,7 +24,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include @@ -61,7 +63,9 @@ XBPython g_pythonParser; #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so" #endif #elif defined(__x86_64__) -#if (defined HAVE_LIBPYTHON2_6) +#if (defined HAVE_LIBPYTHON2_7) +#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so" +#elif (defined HAVE_LIBPYTHON2_6) #define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so" #elif (defined HAVE_LIBPYTHON2_5) #define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so" @@ -69,7 +73,9 @@ XBPython g_pythonParser; #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so" #endif #elif defined(_POWERPC) -#if (defined HAVE_LIBPYTHON2_6) +#if (defined HAVE_LIBPYTHON2_7) +#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so" +#elif (defined HAVE_LIBPYTHON2_6) #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so" #elif (defined HAVE_LIBPYTHON2_5) #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so" @@ -77,7 +83,9 @@ XBPython g_pythonParser; #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so" #endif #elif defined(_POWERPC64) -#if (defined HAVE_LIBPYTHON2_6) +#if (defined HAVE_LIBPYTHON2_7) +#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so" +#elif (defined HAVE_LIBPYTHON2_6) #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so" #elif (defined HAVE_LIBPYTHON2_5) #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so" @@ -85,7 +93,9 @@ XBPython g_pythonParser; #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so" #endif #elif defined(_ARMEL) -#if (defined HAVE_LIBPYTHON2_6) +#if (defined HAVE_LIBPYTHON2_7) +#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so" +#elif (defined HAVE_LIBPYTHON2_6) #define PYTHON_DLL "special://xbmc/system/python/python26-arm.so" #elif (defined HAVE_LIBPYTHON2_5) #define PYTHON_DLL "special://xbmc/system/python/python25-arm.so" @@ -93,7 +103,9 @@ XBPython g_pythonParser; #define PYTHON_DLL "special://xbmc/system/python/python24-arm.so" #endif #else /* !__x86_64__ && !__powerpc__ */ -#if (defined HAVE_LIBPYTHON2_6) +#if (defined HAVE_LIBPYTHON2_7) +#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so" +#elif (defined HAVE_LIBPYTHON2_6) #define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so" #elif (defined HAVE_LIBPYTHON2_5) #define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so" --- a/xbmc/lib/libPython/XBPythonDll.cpp +++ a/xbmc/lib/libPython/XBPythonDll.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/XBPythonDllFuncs.S +++ a/xbmc/lib/libPython/XBPythonDllFuncs.S @@ -2,7 +2,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/linux/Makefile.in +++ a/xbmc/lib/libPython/linux/Makefile.in @@ -5,7 +5,10 @@ LDFLAGS=@LDFLAGS@ SHELL=/bin/bash SYSDIR=../../../../system/python -ifeq (@USE_PYTHON2_6@,1) +ifeq (@USE_PYTHON2_7@,1) + PYVERSION=python2.7 + SO=python27-$(ARCH).so +else ifeq (@USE_PYTHON2_6@,1) PYVERSION=python2.6 SO=python26-$(ARCH).so else ifeq (@USE_PYTHON2_5@,1) --- a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h +++ a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h @@ -26,7 +26,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h +++ a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h +++ a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/action.h +++ a/xbmc/lib/libPython/xbmcmodule/action.h @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/control.h +++ a/xbmc/lib/libPython/xbmcmodule/control.h @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controllist.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controllist.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp +++ a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/dialog.cpp +++ a/xbmc/lib/libPython/xbmcmodule/dialog.cpp @@ -24,7 +24,9 @@ #endif #include "dialog.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/dialog.h +++ a/xbmc/lib/libPython/xbmcmodule/dialog.h @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h +++ a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h +++ a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/keyboard.h +++ a/xbmc/lib/libPython/xbmcmodule/keyboard.h @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/listitem.cpp +++ a/xbmc/lib/libPython/xbmcmodule/listitem.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/listitem.h +++ a/xbmc/lib/libPython/xbmcmodule/listitem.h @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/player.h +++ a/xbmc/lib/libPython/xbmcmodule/player.h @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp +++ a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp @@ -26,7 +26,9 @@ #include "Util.h" #include "pyplaylist.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h +++ a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/pyutil.h +++ a/xbmc/lib/libPython/xbmcmodule/pyutil.h @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/window.h +++ a/xbmc/lib/libPython/xbmcmodule/window.h @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/winxml.cpp +++ a/xbmc/lib/libPython/xbmcmodule/winxml.cpp @@ -24,7 +24,9 @@ #endif #include "winxml.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/winxml.h +++ a/xbmc/lib/libPython/xbmcmodule/winxml.h @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp +++ a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp @@ -24,7 +24,9 @@ #endif #include "winxml.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp +++ a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --- a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp +++ a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp @@ -23,7 +23,10 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #include #elif (defined HAVE_LIBPYTHON2_5) --- a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp +++ a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include + #elif (defined HAVE_LIBPYTHON2_6) #include #elif (defined HAVE_LIBPYTHON2_5) #include --