File tree Expand file tree Collapse file tree 3 files changed +7
-8
lines changed
Filter options
Expand file tree Collapse file tree 3 files changed +7
-8
lines changed
Original file line number Diff line number Diff line change @@ -38,11 +38,7 @@ PERFORMANCE OF THIS SOFTWARE.
38
38
#endif
39
39
#include "pymemcompat.h"
40
40
#include "structmember.h"
41
- #if defined(MS_WINDOWS )
42
- #include <config-win.h>
43
- #else
44
41
#include "my_config.h"
45
- #endif
46
42
#include "mysql.h"
47
43
#include "mysqld_error.h"
48
44
#include "errmsg.h"
Original file line number Diff line number Diff line change 1
1
import os , sys
2
+ from distutils .msvccompiler import get_build_version
3
+
2
4
3
5
def get_config ():
4
6
from setup_common import get_metadata_and_options , enabled , create_release_file
@@ -14,16 +16,17 @@ def get_config():
14
16
else :
15
17
client = "mysqlclient"
16
18
17
- library_dirs = [ os .path .join (connector , r'lib\opt' ) ]
19
+ vcversion = int (get_build_version ())
20
+ library_dirs = [ os .path .join (connector , r'lib\vs%d' % vcversion ) ]
18
21
libraries = [ 'kernel32' , 'advapi32' , 'wsock32' , client ]
19
22
include_dirs = [ os .path .join (connector , r'include' ) ]
20
23
extra_compile_args = [ '/Zl' ]
21
-
24
+
22
25
name = "MySQL-python"
23
26
if enabled (options , 'embedded' ):
24
27
name = name + "-embedded"
25
28
metadata ['name' ] = name
26
-
29
+
27
30
define_macros = [
28
31
('version_info' , metadata ['version_info' ]),
29
32
('__version__' , metadata ['version' ]),
Original file line number Diff line number Diff line change @@ -14,4 +14,4 @@ static = False
14
14
15
15
# http://stackoverflow.com/questions/1972259/mysql-python-install-problem-using-virtualenv-windows-pip
16
16
# Windows connector libs for MySQL. You need a 32-bit connector for your 32-bit Python build.
17
- connector = C:\Program Files (x86)\MySQL\MySQL Connector C 6.0.2
17
+ connector = C:\Program Files (x86)\MySQL\MySQL Connector C 6.1
You can’t perform that action at this time.
0 commit comments