Windows fixes

This commit is contained in:
adustman
2005-01-25 04:45:30 +00:00
parent aac9787605
commit f3752568e2

View File

@ -31,7 +31,7 @@ from distutils.core import setup
from distutils.extension import Extension
mysqlclient = os.getenv('mysqlclient', 'mysqlclient_r')
mysqloptlibs = os.getenv('mysqloptlibs', '').split()
mysqlstatic = eval(os.getenv('mysqlstatic', 'False'))
embedded_server = (mysqlclient == 'mysqld')
name = "MySQL-%s" % os.path.basename(sys.executable)
@ -39,6 +39,8 @@ if embedded_server:
name = name + "-embedded"
version = "1.1.9"
extra_objects = []
if sys.platform == "win32":
mysqlroot = os.getenv('mysqlroot', None)
if mysqlroot is None:
@ -49,7 +51,12 @@ if sys.platform == "win32":
include_dirs = [os.path.join(mysqlroot, "include")]
library_dirs = [os.path.join(mysqlroot, "libs")]
libraries.extend(['zlib', 'msvcrt', 'libcmt', 'wsock32', 'advapi32'])
libraries = ['zlib', 'msvcrt', 'libcmt', 'wsock32', 'advapi32']
if mysqlstatic:
extra_objects.append(os.path.join(
library_dirs[0], mysqlclient+'.lib'))
else:
libraries.append(mysqlclient)
else:
@ -74,6 +81,12 @@ else:
extra_compile_args = config("cflags")
if mysqlstatic:
extra_objects.append(os.path.join(
library_dirs[0],'lib%s.a' % mysqlclient))
else:
libraries.append(mysqlclient)
# avoid frightening noobs with warnings about missing directories
include_dirs = [ d for d in include_dirs if os.path.isdir(d) ]
library_dirs = [ d for d in library_dirs if os.path.isdir(d) ]
@ -132,6 +145,7 @@ metadata = {
library_dirs=library_dirs,
libraries=libraries,
extra_compile_args=extra_compile_args,
extra_objects=extra_objects,
),
],
}