diff options
| author | WiSo <wiso@xbmc.org> | 2011-03-12 19:50:26 +0100 |
|---|---|---|
| committer | Jim Carroll <thecarrolls@jiminger.com> | 2011-04-06 13:42:28 -0400 |
| commit | b9d94d7767c0c706060e05dbafe9e201f0f3ccde (patch) | |
| tree | 3f84879c2824c4bbad81d7187d5c2431361a461c /Makefile.in | |
| parent | 709ad8cadfc84f2b1b22f47cf7ad7af7df83d7ad (diff) | |
This commit represents the including of the new external python for win32. credit goes to mostly WiSo and blinkseb.
[WIN32] added include/python to the include path and removed lib/python/PC
[WIN32] added python27.lib to the linker
[WIN32] removed Py_NO_ENABLE_SHARED
Still need the python directory that was under system because linux internal python build still put things there.
There is a bug in the Windows external python because on Windows, the DLL that python is linked against may not be the DLL that xbmc is linked against. So passing a FILE* to python from an fopen has the potential to crash. This resolves that problem. Credit to blinkseb.
added: download python dependencies with our script.
changed: use Python 2.6.6 on Windows. Debug build is included in the archive, but not copied by default. Set DEBUG to true to copy these.
[WIN32] changed: in case of debug python is used, be sure to exclude it from our installer
[WIN32] fixed: get debug python working. The following has to be defined:
- Py_NO_ENABLE_SHARED
- Py_TRACE_REFS
[WIN32] fixed: oups...
[WIN32] changed: got external python work. It needs more testing to be sure. We don't link against a .lib to be able to load python from where we want (that's why Py_NO_ENABLE_SHARED is defined). We don't define USE_EXTERNAL_PYTHON because we need to use our dll loader.
Fixed a couple of problems: 1) The Makefile.in file was merged incorrectly. 2) We cannot call PyEval_AcquireLock prior to the threads being initialized in linux.
OSX shouldn't build the internal python ... ever ... but especially when USE_EXTERNAL_PYTHON is set.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 21d2288705..7b5e771a72 100644 --- a/Makefile.in +++ b/Makefile.in @@ -461,17 +461,11 @@ imagelib: dllloader $(MAKE) -C lib/cximage-6.0 codecs: papcodecs dvdpcodecs -libs: cmyth libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so -externals: codecs libs python visualizations screensavers - -ifeq ($(findstring osx,@ARCH@), osx) -libs: libhdhomerun libid3tag imagelib libexif $(PYTHON_TARGET) system/libcpluff-@ARCH@.so system/players/paplayer/libmodplug-@ARCH@.so -else -libs: libhdhomerun libid3tag imagelib libexif $(PYTHON_TARGET) system/libcpluff-@ARCH@.so -endif +libs: cmyth libhdhomerun libid3tag imagelib libexif $(PYTHON_TARGET) system/libcpluff-@ARCH@.so +externals: codecs libs $(PYTHON_TARGET) visualizations screensavers xcode_depends: \ - codecs libs python visualizations screensavers eventclients skins \ + codecs libs $(PYTHON_TARGET) visualizations screensavers eventclients skins \ lib/libsquish/libsquish.a \ lib/libapetag/.libs/libapetag.a \ lib/libXBMS/libxbms.a \ |