| 1 |
vapier 11/01/01 21:31:21 |
| 2 |
|
| 3 |
Added: xbmc-10.0-python-2.7.patch |
| 4 |
Log: |
| 5 |
Add support from upstream for python-2.7 #350098 by Tom Flair. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-tv/xbmc/files/xbmc-10.0-python-2.7.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-10.0-python-2.7.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-10.0-python-2.7.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xbmc-10.0-python-2.7.patch |
| 16 |
=================================================================== |
| 17 |
patch from upstream |
| 18 |
|
| 19 |
https://bugs.gentoo.org/350098 |
| 20 |
|
| 21 |
From ab0f816c6307f38d7248d0469379c981f94b816d Mon Sep 17 00:00:00 2001 |
| 22 |
From: ceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> |
| 23 |
Date: Mon, 30 Aug 2010 16:46:50 +0000 |
| 24 |
Subject: [PATCH] Support external python2.7. |
| 25 |
|
| 26 |
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/python2.7@33342 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 |
| 27 |
--- |
| 28 |
configure.in | 10 ++++++- |
| 29 |
xbmc/lib/libPython/XBPyThread.cpp | 5 +++- |
| 30 |
xbmc/lib/libPython/XBPyThread.h | 4 ++- |
| 31 |
xbmc/lib/libPython/XBPython.cpp | 24 +++++++++++++++----- |
| 32 |
xbmc/lib/libPython/XBPythonDll.cpp | 4 ++- |
| 33 |
xbmc/lib/libPython/XBPythonDllFuncs.S | 4 ++- |
| 34 |
xbmc/lib/libPython/linux/Makefile.in | 5 +++- |
| 35 |
xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h | 4 ++- |
| 36 |
xbmc/lib/libPython/xbmcmodule/PythonAddon.h | 4 ++- |
| 37 |
xbmc/lib/libPython/xbmcmodule/PythonPlayer.h | 4 ++- |
| 38 |
xbmc/lib/libPython/xbmcmodule/action.h | 4 ++- |
| 39 |
xbmc/lib/libPython/xbmcmodule/control.h | 4 ++- |
| 40 |
xbmc/lib/libPython/xbmcmodule/controlbutton.cpp | 4 ++- |
| 41 |
xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp | 4 ++- |
| 42 |
xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp | 4 ++- |
| 43 |
xbmc/lib/libPython/xbmcmodule/controlgroup.cpp | 4 ++- |
| 44 |
xbmc/lib/libPython/xbmcmodule/controlimage.cpp | 4 ++- |
| 45 |
xbmc/lib/libPython/xbmcmodule/controllabel.cpp | 4 ++- |
| 46 |
xbmc/lib/libPython/xbmcmodule/controllist.cpp | 4 ++- |
| 47 |
xbmc/lib/libPython/xbmcmodule/controlprogress.cpp | 4 ++- |
| 48 |
.../libPython/xbmcmodule/controlradiobutton.cpp | 4 ++- |
| 49 |
xbmc/lib/libPython/xbmcmodule/controlslider.cpp | 4 ++- |
| 50 |
xbmc/lib/libPython/xbmcmodule/controlspin.cpp | 4 ++- |
| 51 |
xbmc/lib/libPython/xbmcmodule/controltextbox.cpp | 4 ++- |
| 52 |
xbmc/lib/libPython/xbmcmodule/dialog.cpp | 4 ++- |
| 53 |
xbmc/lib/libPython/xbmcmodule/dialog.h | 4 ++- |
| 54 |
xbmc/lib/libPython/xbmcmodule/infotagmusic.h | 4 ++- |
| 55 |
xbmc/lib/libPython/xbmcmodule/infotagvideo.h | 4 ++- |
| 56 |
xbmc/lib/libPython/xbmcmodule/keyboard.h | 4 ++- |
| 57 |
xbmc/lib/libPython/xbmcmodule/listitem.cpp | 4 ++- |
| 58 |
xbmc/lib/libPython/xbmcmodule/listitem.h | 4 ++- |
| 59 |
xbmc/lib/libPython/xbmcmodule/player.h | 4 ++- |
| 60 |
xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp | 4 ++- |
| 61 |
xbmc/lib/libPython/xbmcmodule/pyplaylist.h | 4 ++- |
| 62 |
xbmc/lib/libPython/xbmcmodule/pyutil.h | 4 ++- |
| 63 |
xbmc/lib/libPython/xbmcmodule/window.h | 4 ++- |
| 64 |
xbmc/lib/libPython/xbmcmodule/winxml.cpp | 4 ++- |
| 65 |
xbmc/lib/libPython/xbmcmodule/winxml.h | 4 ++- |
| 66 |
xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp | 4 ++- |
| 67 |
xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp | 4 ++- |
| 68 |
xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp | 5 +++- |
| 69 |
xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp | 4 ++- |
| 70 |
42 files changed, 149 insertions(+), 48 deletions(-) |
| 71 |
|
| 72 |
diff --git a/configure.in b/configure.in |
| 73 |
index 4c0b1b7..cd3429e 100644 |
| 74 |
--- a/configure.in |
| 75 |
+++ b/configure.in |
| 76 |
@@ -901,7 +901,11 @@ fi |
| 77 |
|
| 78 |
# External Python |
| 79 |
if test "$use_external_python" = "yes"; then |
| 80 |
- AC_CHECK_LIB([python2.6], [main], |
| 81 |
+ AC_CHECK_LIB([python2.7], [main], |
| 82 |
+ [AC_DEFINE([HAVE_LIBPYTHON2_7], [1], |
| 83 |
+ [Define to 1 if you have the 'python2.7' library.]) |
| 84 |
+ USE_PYTHON2_7=1], |
| 85 |
+ [AC_CHECK_LIB([python2.6], [main], |
| 86 |
[AC_DEFINE([HAVE_LIBPYTHON2_6], [1], |
| 87 |
[Define to 1 if you have the 'python2.6' library.]) |
| 88 |
USE_PYTHON2_6=1], |
| 89 |
@@ -913,9 +917,10 @@ if test "$use_external_python" = "yes"; then |
| 90 |
[AC_DEFINE([HAVE_LIBPYTHON2_4], [1], |
| 91 |
[Define to 1 if you have the 'python2.4' library.]) |
| 92 |
USE_PYTHON2_4=1], |
| 93 |
- [AC_MSG_ERROR($missing_library)] )] )] ) |
| 94 |
+ [AC_MSG_ERROR($missing_library)] )] )] )] ) |
| 95 |
|
| 96 |
AC_MSG_NOTICE($external_python_enabled) |
| 97 |
+ test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7]) |
| 98 |
test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6]) |
| 99 |
test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5]) |
| 100 |
test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4]) |
| 101 |
@@ -1471,6 +1476,7 @@ AC_SUBST(USE_INTERNAL_LIBDTS) |
| 102 |
AC_SUBST(USE_EXTERNAL_LIBMPEG2) |
| 103 |
AC_SUBST(USE_EXTERNAL_LIBWAVPACK) |
| 104 |
AC_SUBST(USE_EXTERNAL_PYTHON) |
| 105 |
+AC_SUBST(USE_PYTHON2_7) |
| 106 |
AC_SUBST(USE_PYTHON2_6) |
| 107 |
AC_SUBST(USE_PYTHON2_5) |
| 108 |
AC_SUBST(USE_PYTHON2_4) |
| 109 |
diff --git a/xbmc/lib/libPython/XBPyThread.cpp b/xbmc/lib/libPython/XBPyThread.cpp |
| 110 |
index 3a6f34e..71b4b9a 100644 |
| 111 |
--- a/xbmc/lib/libPython/XBPyThread.cpp |
| 112 |
+++ b/xbmc/lib/libPython/XBPyThread.cpp |
| 113 |
@@ -24,7 +24,10 @@ |
| 114 |
#include "config.h" |
| 115 |
#endif |
| 116 |
#if (defined USE_EXTERNAL_PYTHON) |
| 117 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 118 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 119 |
+ #include <python2.7/Python.h> |
| 120 |
+ #include <python2.7/osdefs.h> |
| 121 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 122 |
#include <python2.6/Python.h> |
| 123 |
#include <python2.6/osdefs.h> |
| 124 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 125 |
diff --git a/xbmc/lib/libPython/XBPyThread.h b/xbmc/lib/libPython/XBPyThread.h |
| 126 |
index c3da337..eea7fea 100644 |
| 127 |
--- a/xbmc/lib/libPython/XBPyThread.h |
| 128 |
+++ b/xbmc/lib/libPython/XBPyThread.h |
| 129 |
@@ -26,7 +26,9 @@ |
| 130 |
#include "config.h" |
| 131 |
#endif |
| 132 |
#if (defined USE_EXTERNAL_PYTHON) |
| 133 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 134 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 135 |
+ #include <python2.7/Python.h> |
| 136 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 137 |
#include <python2.6/Python.h> |
| 138 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 139 |
#include <python2.5/Python.h> |
| 140 |
diff --git a/xbmc/lib/libPython/XBPython.cpp b/xbmc/lib/libPython/XBPython.cpp |
| 141 |
index e52cdfb..defcf14 100644 |
| 142 |
--- a/xbmc/lib/libPython/XBPython.cpp |
| 143 |
+++ b/xbmc/lib/libPython/XBPython.cpp |
| 144 |
@@ -24,7 +24,9 @@ |
| 145 |
#include "config.h" |
| 146 |
#endif |
| 147 |
#if (defined USE_EXTERNAL_PYTHON) |
| 148 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 149 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 150 |
+ #include <python2.7/Python.h> |
| 151 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 152 |
#include <python2.6/Python.h> |
| 153 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 154 |
#include <python2.5/Python.h> |
| 155 |
@@ -61,7 +63,9 @@ XBPython g_pythonParser; |
| 156 |
#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so" |
| 157 |
#endif |
| 158 |
#elif defined(__x86_64__) |
| 159 |
-#if (defined HAVE_LIBPYTHON2_6) |
| 160 |
+#if (defined HAVE_LIBPYTHON2_7) |
| 161 |
+#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so" |
| 162 |
+#elif (defined HAVE_LIBPYTHON2_6) |
| 163 |
#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so" |
| 164 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 165 |
#define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so" |
| 166 |
@@ -69,7 +73,9 @@ XBPython g_pythonParser; |
| 167 |
#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so" |
| 168 |
#endif |
| 169 |
#elif defined(_POWERPC) |
| 170 |
-#if (defined HAVE_LIBPYTHON2_6) |
| 171 |
+#if (defined HAVE_LIBPYTHON2_7) |
| 172 |
+#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so" |
| 173 |
+#elif (defined HAVE_LIBPYTHON2_6) |
| 174 |
#define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so" |
| 175 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 176 |
#define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so" |
| 177 |
@@ -77,7 +83,9 @@ XBPython g_pythonParser; |
| 178 |
#define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so" |
| 179 |
#endif |
| 180 |
#elif defined(_POWERPC64) |
| 181 |
-#if (defined HAVE_LIBPYTHON2_6) |
| 182 |
+#if (defined HAVE_LIBPYTHON2_7) |
| 183 |
+#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so" |
| 184 |
+#elif (defined HAVE_LIBPYTHON2_6) |
| 185 |
#define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so" |
| 186 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 187 |
#define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so" |
| 188 |
@@ -85,7 +93,9 @@ XBPython g_pythonParser; |
| 189 |
#define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so" |
| 190 |
#endif |
| 191 |
#elif defined(_ARMEL) |
| 192 |
-#if (defined HAVE_LIBPYTHON2_6) |
| 193 |
+#if (defined HAVE_LIBPYTHON2_7) |
| 194 |
+#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so" |
| 195 |
+#elif (defined HAVE_LIBPYTHON2_6) |
| 196 |
#define PYTHON_DLL "special://xbmc/system/python/python26-arm.so" |
| 197 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 198 |
#define PYTHON_DLL "special://xbmc/system/python/python25-arm.so" |
| 199 |
@@ -93,7 +103,9 @@ XBPython g_pythonParser; |
| 200 |
#define PYTHON_DLL "special://xbmc/system/python/python24-arm.so" |
| 201 |
#endif |
| 202 |
#else /* !__x86_64__ && !__powerpc__ */ |
| 203 |
-#if (defined HAVE_LIBPYTHON2_6) |
| 204 |
+#if (defined HAVE_LIBPYTHON2_7) |
| 205 |
+#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so" |
| 206 |
+#elif (defined HAVE_LIBPYTHON2_6) |
| 207 |
#define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so" |
| 208 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 209 |
#define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so" |
| 210 |
diff --git a/xbmc/lib/libPython/XBPythonDll.cpp b/xbmc/lib/libPython/XBPythonDll.cpp |
| 211 |
index bc9d827..87ac7d7 100644 |
| 212 |
--- a/xbmc/lib/libPython/XBPythonDll.cpp |
| 213 |
+++ b/xbmc/lib/libPython/XBPythonDll.cpp |
| 214 |
@@ -23,7 +23,9 @@ |
| 215 |
#include "config.h" |
| 216 |
#endif |
| 217 |
#if (defined USE_EXTERNAL_PYTHON) |
| 218 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 219 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 220 |
+ #include <python2.7/pyconfig.h> |
| 221 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 222 |
#include <python2.6/pyconfig.h> |
| 223 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 224 |
#include <python2.5/pyconfig.h> |
| 225 |
diff --git a/xbmc/lib/libPython/XBPythonDllFuncs.S b/xbmc/lib/libPython/XBPythonDllFuncs.S |
| 226 |
index 6b7a6c3..f59b192 100644 |
| 227 |
--- a/xbmc/lib/libPython/XBPythonDllFuncs.S |
| 228 |
+++ b/xbmc/lib/libPython/XBPythonDllFuncs.S |
| 229 |
@@ -2,7 +2,9 @@ |
| 230 |
#include "config.h" |
| 231 |
#endif |
| 232 |
#if (defined USE_EXTERNAL_PYTHON) |
| 233 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 234 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 235 |
+ #include <python2.7/pyconfig.h> |
| 236 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 237 |
#include <python2.6/pyconfig.h> |
| 238 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 239 |
#include <python2.5/pyconfig.h> |
| 240 |
diff --git a/xbmc/lib/libPython/linux/Makefile.in b/xbmc/lib/libPython/linux/Makefile.in |
| 241 |
index 7011434..0786937 100644 |
| 242 |
--- a/xbmc/lib/libPython/linux/Makefile.in |
| 243 |
+++ b/xbmc/lib/libPython/linux/Makefile.in |
| 244 |
@@ -5,7 +5,10 @@ LDFLAGS=@LDFLAGS@ |
| 245 |
SHELL=/bin/bash |
| 246 |
SYSDIR=../../../../system/python |
| 247 |
|
| 248 |
-ifeq (@USE_PYTHON2_6@,1) |
| 249 |
+ifeq (@USE_PYTHON2_7@,1) |
| 250 |
+ PYVERSION=python2.7 |
| 251 |
+ SO=python27-$(ARCH).so |
| 252 |
+else ifeq (@USE_PYTHON2_6@,1) |
| 253 |
PYVERSION=python2.6 |
| 254 |
SO=python26-$(ARCH).so |
| 255 |
else ifeq (@USE_PYTHON2_5@,1) |
| 256 |
diff --git a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h b/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h |
| 257 |
index 620d9bd..06fa146 100644 |
| 258 |
--- a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h |
| 259 |
+++ b/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h |
| 260 |
@@ -26,7 +26,9 @@ |
| 261 |
#include "config.h" |
| 262 |
#endif |
| 263 |
#if (defined USE_EXTERNAL_PYTHON) |
| 264 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 265 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 266 |
+ #include <python2.7/Python.h> |
| 267 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 268 |
#include <python2.6/Python.h> |
| 269 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 270 |
#include <python2.5/Python.h> |
| 271 |
diff --git a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h b/xbmc/lib/libPython/xbmcmodule/PythonAddon.h |
| 272 |
index ec7ed28..41eb8ea 100644 |
| 273 |
--- a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h |
| 274 |
+++ b/xbmc/lib/libPython/xbmcmodule/PythonAddon.h |
| 275 |
@@ -25,7 +25,9 @@ |
| 276 |
#include "config.h" |
| 277 |
#endif |
| 278 |
#if (defined USE_EXTERNAL_PYTHON) |
| 279 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 280 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 281 |
+ #include <python2.7/Python.h> |
| 282 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 283 |
#include <python2.6/Python.h> |
| 284 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 285 |
#include <python2.5/Python.h> |
| 286 |
diff --git a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h b/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h |
| 287 |
index ecee993..24a1c87 100644 |
| 288 |
--- a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h |
| 289 |
+++ b/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h |
| 290 |
@@ -25,7 +25,9 @@ |
| 291 |
#include "config.h" |
| 292 |
#endif |
| 293 |
#if (defined USE_EXTERNAL_PYTHON) |
| 294 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 295 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 296 |
+ #include <python2.7/Python.h> |
| 297 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 298 |
#include <python2.6/Python.h> |
| 299 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 300 |
#include <python2.5/Python.h> |
| 301 |
diff --git a/xbmc/lib/libPython/xbmcmodule/action.h b/xbmc/lib/libPython/xbmcmodule/action.h |
| 302 |
index 0e20000..7f8b1bc 100644 |
| 303 |
--- a/xbmc/lib/libPython/xbmcmodule/action.h |
| 304 |
+++ b/xbmc/lib/libPython/xbmcmodule/action.h |
| 305 |
@@ -23,7 +23,9 @@ |
| 306 |
#include "config.h" |
| 307 |
#endif |
| 308 |
#if (defined USE_EXTERNAL_PYTHON) |
| 309 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 310 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 311 |
+ #include <python2.7/Python.h> |
| 312 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 313 |
#include <python2.6/Python.h> |
| 314 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 315 |
#include <python2.5/Python.h> |
| 316 |
diff --git a/xbmc/lib/libPython/xbmcmodule/control.h b/xbmc/lib/libPython/xbmcmodule/control.h |
| 317 |
index c76b37c..a9ec63d 100644 |
| 318 |
--- a/xbmc/lib/libPython/xbmcmodule/control.h |
| 319 |
+++ b/xbmc/lib/libPython/xbmcmodule/control.h |
| 320 |
@@ -23,7 +23,9 @@ |
| 321 |
#include "config.h" |
| 322 |
#endif |
| 323 |
#if (defined USE_EXTERNAL_PYTHON) |
| 324 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 325 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 326 |
+ #include <python2.7/Python.h> |
| 327 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 328 |
#include <python2.6/Python.h> |
| 329 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 330 |
#include <python2.5/Python.h> |
| 331 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp b/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp |
| 332 |
index b24ccce..7455ca7 100644 |
| 333 |
--- a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp |
| 334 |
+++ b/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp |
| 335 |
@@ -23,7 +23,9 @@ |
| 336 |
#include "config.h" |
| 337 |
#endif |
| 338 |
#if (defined USE_EXTERNAL_PYTHON) |
| 339 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 340 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 341 |
+ #include <python2.7/Python.h> |
| 342 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 343 |
#include <python2.6/Python.h> |
| 344 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 345 |
#include <python2.5/Python.h> |
| 346 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp b/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp |
| 347 |
index 96e4743..86a7d8b 100644 |
| 348 |
--- a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp |
| 349 |
+++ b/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp |
| 350 |
@@ -23,7 +23,9 @@ |
| 351 |
#include "config.h" |
| 352 |
#endif |
| 353 |
#if (defined USE_EXTERNAL_PYTHON) |
| 354 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 355 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 356 |
+ #include <python2.7/Python.h> |
| 357 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 358 |
#include <python2.6/Python.h> |
| 359 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 360 |
#include <python2.5/Python.h> |
| 361 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp b/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp |
| 362 |
index 68442d8..c6eb052 100644 |
| 363 |
--- a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp |
| 364 |
+++ b/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp |
| 365 |
@@ -23,7 +23,9 @@ |
| 366 |
#include "config.h" |
| 367 |
#endif |
| 368 |
#if (defined USE_EXTERNAL_PYTHON) |
| 369 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 370 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 371 |
+ #include <python2.7/Python.h> |
| 372 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 373 |
#include <python2.6/Python.h> |
| 374 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 375 |
#include <python2.5/Python.h> |
| 376 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp b/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp |
| 377 |
index aadfc17..8275324 100644 |
| 378 |
--- a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp |
| 379 |
+++ b/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp |
| 380 |
@@ -23,7 +23,9 @@ |
| 381 |
#include "config.h" |
| 382 |
#endif |
| 383 |
#if (defined USE_EXTERNAL_PYTHON) |
| 384 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 385 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 386 |
+ #include <python2.7/Python.h> |
| 387 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 388 |
#include <python2.6/Python.h> |
| 389 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 390 |
#include <python2.5/Python.h> |
| 391 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp b/xbmc/lib/libPython/xbmcmodule/controlimage.cpp |
| 392 |
index 79835d6..f106e90 100644 |
| 393 |
--- a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp |
| 394 |
+++ b/xbmc/lib/libPython/xbmcmodule/controlimage.cpp |
| 395 |
@@ -23,7 +23,9 @@ |
| 396 |
#include "config.h" |
| 397 |
#endif |
| 398 |
#if (defined USE_EXTERNAL_PYTHON) |
| 399 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 400 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 401 |
+ #include <python2.7/Python.h> |
| 402 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 403 |
#include <python2.6/Python.h> |
| 404 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 405 |
#include <python2.5/Python.h> |
| 406 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp b/xbmc/lib/libPython/xbmcmodule/controllabel.cpp |
| 407 |
index aca22e4..38a9c07 100644 |
| 408 |
--- a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp |
| 409 |
+++ b/xbmc/lib/libPython/xbmcmodule/controllabel.cpp |
| 410 |
@@ -23,7 +23,9 @@ |
| 411 |
#include "config.h" |
| 412 |
#endif |
| 413 |
#if (defined USE_EXTERNAL_PYTHON) |
| 414 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 415 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 416 |
+ #include <python2.7/Python.h> |
| 417 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 418 |
#include <python2.6/Python.h> |
| 419 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 420 |
#include <python2.5/Python.h> |
| 421 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controllist.cpp b/xbmc/lib/libPython/xbmcmodule/controllist.cpp |
| 422 |
index 0c67b5c..bb57776 100644 |
| 423 |
--- a/xbmc/lib/libPython/xbmcmodule/controllist.cpp |
| 424 |
+++ b/xbmc/lib/libPython/xbmcmodule/controllist.cpp |
| 425 |
@@ -23,7 +23,9 @@ |
| 426 |
#include "config.h" |
| 427 |
#endif |
| 428 |
#if (defined USE_EXTERNAL_PYTHON) |
| 429 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 430 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 431 |
+ #include <python2.7/Python.h> |
| 432 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 433 |
#include <python2.6/Python.h> |
| 434 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 435 |
#include <python2.5/Python.h> |
| 436 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp b/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp |
| 437 |
index a21e462..b460a2a 100644 |
| 438 |
--- a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp |
| 439 |
+++ b/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp |
| 440 |
@@ -23,7 +23,9 @@ |
| 441 |
#include "config.h" |
| 442 |
#endif |
| 443 |
#if (defined USE_EXTERNAL_PYTHON) |
| 444 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 445 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 446 |
+ #include <python2.7/Python.h> |
| 447 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 448 |
#include <python2.6/Python.h> |
| 449 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 450 |
#include <python2.5/Python.h> |
| 451 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp b/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp |
| 452 |
index ec54efd..b966a17 100644 |
| 453 |
--- a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp |
| 454 |
+++ b/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp |
| 455 |
@@ -23,7 +23,9 @@ |
| 456 |
#include "config.h" |
| 457 |
#endif |
| 458 |
#if (defined USE_EXTERNAL_PYTHON) |
| 459 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 460 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 461 |
+ #include <python2.7/Python.h> |
| 462 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 463 |
#include <python2.6/Python.h> |
| 464 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 465 |
#include <python2.5/Python.h> |
| 466 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp b/xbmc/lib/libPython/xbmcmodule/controlslider.cpp |
| 467 |
index 21ea5e7..c5f65b3 100644 |
| 468 |
--- a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp |
| 469 |
+++ b/xbmc/lib/libPython/xbmcmodule/controlslider.cpp |
| 470 |
@@ -23,7 +23,9 @@ |
| 471 |
#include "config.h" |
| 472 |
#endif |
| 473 |
#if (defined USE_EXTERNAL_PYTHON) |
| 474 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 475 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 476 |
+ #include <python2.7/Python.h> |
| 477 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 478 |
#include <python2.6/Python.h> |
| 479 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 480 |
#include <python2.5/Python.h> |
| 481 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp b/xbmc/lib/libPython/xbmcmodule/controlspin.cpp |
| 482 |
index 4e24e14..feead3c 100644 |
| 483 |
--- a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp |
| 484 |
+++ b/xbmc/lib/libPython/xbmcmodule/controlspin.cpp |
| 485 |
@@ -23,7 +23,9 @@ |
| 486 |
#include "config.h" |
| 487 |
#endif |
| 488 |
#if (defined USE_EXTERNAL_PYTHON) |
| 489 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 490 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 491 |
+ #include <python2.7/Python.h> |
| 492 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 493 |
#include <python2.6/Python.h> |
| 494 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 495 |
#include <python2.5/Python.h> |
| 496 |
diff --git a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp b/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp |
| 497 |
index b4c44d5..4a7c688 100644 |
| 498 |
--- a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp |
| 499 |
+++ b/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp |
| 500 |
@@ -23,7 +23,9 @@ |
| 501 |
#include "config.h" |
| 502 |
#endif |
| 503 |
#if (defined USE_EXTERNAL_PYTHON) |
| 504 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 505 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 506 |
+ #include <python2.7/Python.h> |
| 507 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 508 |
#include <python2.6/Python.h> |
| 509 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 510 |
#include <python2.5/Python.h> |
| 511 |
diff --git a/xbmc/lib/libPython/xbmcmodule/dialog.cpp b/xbmc/lib/libPython/xbmcmodule/dialog.cpp |
| 512 |
index caa8986..cffe485 100644 |
| 513 |
--- a/xbmc/lib/libPython/xbmcmodule/dialog.cpp |
| 514 |
+++ b/xbmc/lib/libPython/xbmcmodule/dialog.cpp |
| 515 |
@@ -24,7 +24,9 @@ |
| 516 |
#endif |
| 517 |
#include "dialog.h" |
| 518 |
#if (defined USE_EXTERNAL_PYTHON) |
| 519 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 520 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 521 |
+ #include <python2.7/Python.h> |
| 522 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 523 |
#include <python2.6/Python.h> |
| 524 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 525 |
#include <python2.5/Python.h> |
| 526 |
diff --git a/xbmc/lib/libPython/xbmcmodule/dialog.h b/xbmc/lib/libPython/xbmcmodule/dialog.h |
| 527 |
index edcae41..a61c4b1 100644 |
| 528 |
--- a/xbmc/lib/libPython/xbmcmodule/dialog.h |
| 529 |
+++ b/xbmc/lib/libPython/xbmcmodule/dialog.h |
| 530 |
@@ -23,7 +23,9 @@ |
| 531 |
#include "config.h" |
| 532 |
#endif |
| 533 |
#if (defined USE_EXTERNAL_PYTHON) |
| 534 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 535 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 536 |
+ #include <python2.7/Python.h> |
| 537 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 538 |
#include <python2.6/Python.h> |
| 539 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 540 |
#include <python2.5/Python.h> |
| 541 |
diff --git a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h b/xbmc/lib/libPython/xbmcmodule/infotagmusic.h |
| 542 |
index d202e48..590b858 100644 |
| 543 |
--- a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h |
| 544 |
+++ b/xbmc/lib/libPython/xbmcmodule/infotagmusic.h |
| 545 |
@@ -23,7 +23,9 @@ |
| 546 |
#include "config.h" |
| 547 |
#endif |
| 548 |
#if (defined USE_EXTERNAL_PYTHON) |
| 549 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 550 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 551 |
+ #include <python2.7/Python.h> |
| 552 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 553 |
#include <python2.6/Python.h> |
| 554 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 555 |
#include <python2.5/Python.h> |
| 556 |
diff --git a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h b/xbmc/lib/libPython/xbmcmodule/infotagvideo.h |
| 557 |
index f2bb300..e808573 100644 |
| 558 |
--- a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h |
| 559 |
+++ b/xbmc/lib/libPython/xbmcmodule/infotagvideo.h |
| 560 |
@@ -23,7 +23,9 @@ |
| 561 |
#include "config.h" |
| 562 |
#endif |
| 563 |
#if (defined USE_EXTERNAL_PYTHON) |
| 564 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 565 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 566 |
+ #include <python2.7/Python.h> |
| 567 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 568 |
#include <python2.6/Python.h> |
| 569 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 570 |
#include <python2.5/Python.h> |
| 571 |
diff --git a/xbmc/lib/libPython/xbmcmodule/keyboard.h b/xbmc/lib/libPython/xbmcmodule/keyboard.h |
| 572 |
index e5c817f..0f069e3 100644 |
| 573 |
--- a/xbmc/lib/libPython/xbmcmodule/keyboard.h |
| 574 |
+++ b/xbmc/lib/libPython/xbmcmodule/keyboard.h |
| 575 |
@@ -23,7 +23,9 @@ |
| 576 |
#include "config.h" |
| 577 |
#endif |
| 578 |
#if (defined USE_EXTERNAL_PYTHON) |
| 579 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 580 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 581 |
+ #include <python2.7/Python.h> |
| 582 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 583 |
#include <python2.6/Python.h> |
| 584 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 585 |
#include <python2.5/Python.h> |
| 586 |
diff --git a/xbmc/lib/libPython/xbmcmodule/listitem.cpp b/xbmc/lib/libPython/xbmcmodule/listitem.cpp |
| 587 |
index 137436e..20105ef 100644 |
| 588 |
--- a/xbmc/lib/libPython/xbmcmodule/listitem.cpp |
| 589 |
+++ b/xbmc/lib/libPython/xbmcmodule/listitem.cpp |
| 590 |
@@ -23,7 +23,9 @@ |
| 591 |
#include "config.h" |
| 592 |
#endif |
| 593 |
#if (defined USE_EXTERNAL_PYTHON) |
| 594 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 595 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 596 |
+ #include <python2.7/Python.h> |
| 597 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 598 |
#include <python2.6/Python.h> |
| 599 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 600 |
#include <python2.5/Python.h> |
| 601 |
diff --git a/xbmc/lib/libPython/xbmcmodule/listitem.h b/xbmc/lib/libPython/xbmcmodule/listitem.h |
| 602 |
index 7ebcd6c..3d4a6c8 100644 |
| 603 |
--- a/xbmc/lib/libPython/xbmcmodule/listitem.h |
| 604 |
+++ b/xbmc/lib/libPython/xbmcmodule/listitem.h |
| 605 |
@@ -25,7 +25,9 @@ |
| 606 |
#include "config.h" |
| 607 |
#endif |
| 608 |
#if (defined USE_EXTERNAL_PYTHON) |
| 609 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 610 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 611 |
+ #include <python2.7/Python.h> |
| 612 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 613 |
#include <python2.6/Python.h> |
| 614 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 615 |
#include <python2.5/Python.h> |
| 616 |
diff --git a/xbmc/lib/libPython/xbmcmodule/player.h b/xbmc/lib/libPython/xbmcmodule/player.h |
| 617 |
index 48dc9c7..34a102d 100644 |
| 618 |
--- a/xbmc/lib/libPython/xbmcmodule/player.h |
| 619 |
+++ b/xbmc/lib/libPython/xbmcmodule/player.h |
| 620 |
@@ -23,7 +23,9 @@ |
| 621 |
#include "config.h" |
| 622 |
#endif |
| 623 |
#if (defined USE_EXTERNAL_PYTHON) |
| 624 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 625 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 626 |
+ #include <python2.7/Python.h> |
| 627 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 628 |
#include <python2.6/Python.h> |
| 629 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 630 |
#include <python2.5/Python.h> |
| 631 |
diff --git a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp b/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp |
| 632 |
index c7e7f62..6df8548 100644 |
| 633 |
--- a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp |
| 634 |
+++ b/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp |
| 635 |
@@ -26,7 +26,9 @@ |
| 636 |
#include "Util.h" |
| 637 |
#include "pyplaylist.h" |
| 638 |
#if (defined USE_EXTERNAL_PYTHON) |
| 639 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 640 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 641 |
+ #include <python2.7/Python.h> |
| 642 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 643 |
#include <python2.6/Python.h> |
| 644 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 645 |
#include <python2.5/Python.h> |
| 646 |
diff --git a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h b/xbmc/lib/libPython/xbmcmodule/pyplaylist.h |
| 647 |
index f2334bb..2410314 100644 |
| 648 |
--- a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h |
| 649 |
+++ b/xbmc/lib/libPython/xbmcmodule/pyplaylist.h |
| 650 |
@@ -25,7 +25,9 @@ |
| 651 |
#include "config.h" |
| 652 |
#endif |
| 653 |
#if (defined USE_EXTERNAL_PYTHON) |
| 654 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 655 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 656 |
+ #include <python2.7/Python.h> |
| 657 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 658 |
#include <python2.6/Python.h> |
| 659 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 660 |
#include <python2.5/Python.h> |
| 661 |
diff --git a/xbmc/lib/libPython/xbmcmodule/pyutil.h b/xbmc/lib/libPython/xbmcmodule/pyutil.h |
| 662 |
index 4acf6e5..1a156f8 100644 |
| 663 |
--- a/xbmc/lib/libPython/xbmcmodule/pyutil.h |
| 664 |
+++ b/xbmc/lib/libPython/xbmcmodule/pyutil.h |
| 665 |
@@ -25,7 +25,9 @@ |
| 666 |
#include "config.h" |
| 667 |
#endif |
| 668 |
#if (defined USE_EXTERNAL_PYTHON) |
| 669 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 670 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 671 |
+ #include <python2.7/Python.h> |
| 672 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 673 |
#include <python2.6/Python.h> |
| 674 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 675 |
#include <python2.5/Python.h> |
| 676 |
diff --git a/xbmc/lib/libPython/xbmcmodule/window.h b/xbmc/lib/libPython/xbmcmodule/window.h |
| 677 |
index 6ce8e72..40304ff 100644 |
| 678 |
--- a/xbmc/lib/libPython/xbmcmodule/window.h |
| 679 |
+++ b/xbmc/lib/libPython/xbmcmodule/window.h |
| 680 |
@@ -23,7 +23,9 @@ |
| 681 |
#include "config.h" |
| 682 |
#endif |
| 683 |
#if (defined USE_EXTERNAL_PYTHON) |
| 684 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 685 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 686 |
+ #include <python2.7/Python.h> |
| 687 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 688 |
#include <python2.6/Python.h> |
| 689 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 690 |
#include <python2.5/Python.h> |
| 691 |
diff --git a/xbmc/lib/libPython/xbmcmodule/winxml.cpp b/xbmc/lib/libPython/xbmcmodule/winxml.cpp |
| 692 |
index d3b703f..3e1b3c8 100644 |
| 693 |
--- a/xbmc/lib/libPython/xbmcmodule/winxml.cpp |
| 694 |
+++ b/xbmc/lib/libPython/xbmcmodule/winxml.cpp |
| 695 |
@@ -24,7 +24,9 @@ |
| 696 |
#endif |
| 697 |
#include "winxml.h" |
| 698 |
#if (defined USE_EXTERNAL_PYTHON) |
| 699 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 700 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 701 |
+ #include <python2.7/Python.h> |
| 702 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 703 |
#include <python2.6/Python.h> |
| 704 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 705 |
#include <python2.5/Python.h> |
| 706 |
diff --git a/xbmc/lib/libPython/xbmcmodule/winxml.h b/xbmc/lib/libPython/xbmcmodule/winxml.h |
| 707 |
index 6e6489e..f3a8dd8 100644 |
| 708 |
--- a/xbmc/lib/libPython/xbmcmodule/winxml.h |
| 709 |
+++ b/xbmc/lib/libPython/xbmcmodule/winxml.h |
| 710 |
@@ -23,7 +23,9 @@ |
| 711 |
#include "config.h" |
| 712 |
#endif |
| 713 |
#if (defined USE_EXTERNAL_PYTHON) |
| 714 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 715 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 716 |
+ #include <python2.7/Python.h> |
| 717 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 718 |
#include <python2.6/Python.h> |
| 719 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 720 |
#include <python2.5/Python.h> |
| 721 |
diff --git a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp b/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp |
| 722 |
index b021501..92d9903 100644 |
| 723 |
--- a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp |
| 724 |
+++ b/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp |
| 725 |
@@ -24,7 +24,9 @@ |
| 726 |
#endif |
| 727 |
#include "winxml.h" |
| 728 |
#if (defined USE_EXTERNAL_PYTHON) |
| 729 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 730 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 731 |
+ #include <python2.7/Python.h> |
| 732 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 733 |
#include <python2.6/Python.h> |
| 734 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 735 |
#include <python2.5/Python.h> |
| 736 |
diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp |
| 737 |
index b8bc0a3..c65aded 100644 |
| 738 |
--- a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp |
| 739 |
+++ b/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp |
| 740 |
@@ -23,7 +23,9 @@ |
| 741 |
#include "config.h" |
| 742 |
#endif |
| 743 |
#if (defined USE_EXTERNAL_PYTHON) |
| 744 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 745 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 746 |
+ #include <python2.7/Python.h> |
| 747 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 748 |
#include <python2.6/Python.h> |
| 749 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 750 |
#include <python2.5/Python.h> |
| 751 |
diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp |
| 752 |
index 87c0ead..9941769 100644 |
| 753 |
--- a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp |
| 754 |
+++ b/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp |
| 755 |
@@ -23,7 +23,10 @@ |
| 756 |
#include "config.h" |
| 757 |
#endif |
| 758 |
#if (defined USE_EXTERNAL_PYTHON) |
| 759 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 760 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 761 |
+ #include <python2.7/Python.h> |
| 762 |
+ #include <python2.7/structmember.h> |
| 763 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 764 |
#include <python2.6/Python.h> |
| 765 |
#include <python2.6/structmember.h> |
| 766 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 767 |
diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp |
| 768 |
index 3bab5a9..1e2c480 100644 |
| 769 |
--- a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp |
| 770 |
+++ b/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp |
| 771 |
@@ -23,7 +23,9 @@ |
| 772 |
#include "config.h" |
| 773 |
#endif |
| 774 |
#if (defined USE_EXTERNAL_PYTHON) |
| 775 |
- #if (defined HAVE_LIBPYTHON2_6) |
| 776 |
+ #if (defined HAVE_LIBPYTHON2_7) |
| 777 |
+ #include <python2.7/Python.h> |
| 778 |
+ #elif (defined HAVE_LIBPYTHON2_6) |
| 779 |
#include <python2.6/Python.h> |
| 780 |
#elif (defined HAVE_LIBPYTHON2_5) |
| 781 |
#include <python2.5/Python.h> |
| 782 |
-- |
| 783 |
1.7.3.1 |
Archives