Skip to content

Support MySQL-Connector/C 6.1 for Windows. #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
methane wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support MySQL-Connector/C 6.1 for Windows. #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions _mysql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ PERFORMANCE OF THIS SOFTWARE.
#endif
#include "pymemcompat.h"
#include "structmember.h"
#if defined(MS_WINDOWS)
#include <config-win.h>
#else
#include "my_config.h"
#endif
#include "mysql.h"
#include "mysqld_error.h"
#include "errmsg.h"
Expand Down
9 changes: 6 additions & 3 deletions setup_windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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']),
Expand Down
2 changes: 1 addition & 1 deletion site.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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