From 63df97dc058098653481993b5e8b04cc29cdf88d Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Mon, 28 Apr 2014 11:11:49 +0900 Subject: [PATCH] Support MySQL-Connector/C 6.1 for Windows. --- _mysql.c | 4 ---- setup_windows.py | 9 ++++++--- site.cfg | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/_mysql.c b/_mysql.c index 5b81c79..54fc35b 100644 --- a/_mysql.c +++ b/_mysql.c @@ -38,11 +38,7 @@ PERFORMANCE OF THIS SOFTWARE. #endif #include "pymemcompat.h" #include "structmember.h" -#if defined(MS_WINDOWS) -#include -#else #include "my_config.h" -#endif #include "mysql.h" #include "mysqld_error.h" #include "errmsg.h" diff --git a/setup_windows.py b/setup_windows.py index ffe6397..3c3e1de 100644 --- a/setup_windows.py +++ b/setup_windows.py @@ -1,4 +1,6 @@ import os, sys +from distutils.msvccompiler import get_build_version + def get_config(): from setup_common import get_metadata_and_options, enabled, create_release_file @@ -14,16 +16,17 @@ def get_config(): else: client = "mysqlclient" - library_dirs = [ os.path.join(connector, r'lib\opt') ] + vcversion = int(get_build_version()) + library_dirs = [ os.path.join(connector, r'lib\vs%d' % vcversion) ] libraries = [ 'kernel32', 'advapi32', 'wsock32', client ] include_dirs = [ os.path.join(connector, r'include') ] extra_compile_args = [ '/Zl' ] - + name = "MySQL-python" if enabled(options, 'embedded'): name = name + "-embedded" metadata['name'] = name - + define_macros = [ ('version_info', metadata['version_info']), ('__version__', metadata['version']), diff --git a/site.cfg b/site.cfg index 369c87e..8e2ab99 100644 --- a/site.cfg +++ b/site.cfg @@ -14,4 +14,4 @@ static = False # http://stackoverflow.com/questions/1972259/mysql-python-install-problem-using-virtualenv-windows-pip # Windows connector libs for MySQL. You need a 32-bit connector for your 32-bit Python build. -connector = C:\Program Files (x86)\MySQL\MySQL Connector C 6.0.2 +connector = C:\Program Files (x86)\MySQL\MySQL Connector C 6.1