[WIN32] remove python24.zlib and use a copy of python/lib from our svn. needs some...

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31475 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/system/python/python24.zlib b/system/python/python24.zlib
deleted file mode 100644 (file)
index e1bb9c4..0000000
Binary files a/system/python/python24.zlib and /dev/null differ

diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
index 46e3320..b7a40ba 100644 (file)
--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
@@ -133,7 +133,7 @@ extern "C" void __stdcall init_emu_environ()
 #else
   dll_putenv("OS=unknown");
 #endif
-  dll_putenv("PYTHONPATH=special://xbmc/system/python/python24.zlib;special://xbmc/system/python/DLLs;special://xbmc/system/python/Lib");
+  dll_putenv("PYTHONPATH=special://xbmc/system/python/DLLs;special://xbmc/system/python/Lib");
   dll_putenv("PYTHONHOME=special://xbmc/system/python");
   dll_putenv("PATH=.;special://xbmc;special://xbmc/system/python");
   //dll_putenv("PYTHONCASEOK=1");

diff --git a/xbmc/lib/libPython/XBPython.cpp b/xbmc/lib/libPython/XBPython.cpp
index 180f3b1..22650b2 100644 (file)
--- a/xbmc/lib/libPython/XBPython.cpp
+++ b/xbmc/lib/libPython/XBPython.cpp
@@ -349,8 +349,7 @@ void XBPython::Initialize()
 
       // first we check if all necessary files are installed
 #ifndef _LINUX
-      if (!FileExist("special://xbmc/system/python/python24.zlib") ||
-        !FileExist("special://xbmc/system/python/DLLs/_socket.pyd") ||
+      if(!FileExist("special://xbmc/system/python/DLLs/_socket.pyd") ||
         !FileExist("special://xbmc/system/python/DLLs/_ssl.pyd") ||
         !FileExist("special://xbmc/system/python/DLLs/bz2.pyd") ||
         !FileExist("special://xbmc/system/python/DLLs/pyexpat.pyd") ||