Commit 9fbf9355 authored by Ajay Patel's avatar Ajay Patel

Add user32 as a library on Windows

parent 2fabfc8a
Pipeline #36732888 failed with stages
in 16 minutes and 17 seconds
......@@ -112,7 +112,7 @@ def get_modules(THIRD_PARTY, INTERNAL, PROJ_PATH,
ICU = os.path.relpath(SQLITE3 + '/icu_unix', PROJ_PATH)
includes = [os.path.relpath(SQLITE3, PROJ_PATH)]
libraries = [os.path.relpath(SQLITE3, PROJ_PATH)]
compile_args = ["-O4", "-std=c++11", "/link User32.lib" if sys.platform == "win32" else "-O4"]
compile_args = ["-O4", "-std=c++11"]
link_args = ["-flto"]
libraries.append(ICU)
includes.append(ICU)
......@@ -461,6 +461,7 @@ def get_modules(THIRD_PARTY, INTERNAL, PROJ_PATH,
sources=[source] + [pyinit_source],
include_dirs=includes,
library_dirs=libraries,
libraries=["user32"] if sys.platform == "win32" else [],
extra_compile_args=["-O4"],
extra_link_args=link_args))
return miscs
......
......@@ -891,9 +891,9 @@ complete SQLite API into Python.""",
["src/apsw.c", "src/sqlite3.c", "src/icu.cpp"], # PLASTICITY
include_dirs=include_dirs + include_plasticity, # PLASTICITY
library_dirs=library_dirs,
libraries=libraries,
libraries=libraries + (["user32"] if sys.platform == "win32" else []), # PLASTICITY
define_macros=define_macros,
extra_compile_args=["-O4", "-std=c++11", "/link User32.lib" if sys.platform == "win32" else "-O4"], # PLASTICITY
extra_compile_args=["-O4", "-std=c++11"], # PLASTICITY
extra_link_args=["-flto"], # PLASTICITY
depends=depends)],
......
......@@ -291,10 +291,10 @@ def get_setup_args():
include_dirs=include_dirs + include_plasticity, # PLASTICITY
library_dirs=library_dirs,
runtime_library_dirs=runtime_library_dirs,
libraries=libraries,
libraries=libraries + (["user32"] if sys.platform == "win32" else []), # PLASTICITY
extra_objects=extra_objects,
define_macros=define_macros,
extra_compile_args=["-O4", "-std=c++11", "/link User32.lib" if sys.platform == "win32" else "-O4"], # PLASTICITY
extra_compile_args=["-O4", "-std=c++11"], # PLASTICITY
extra_link_args=["-flto"], # PLASTICITY
)],
classifiers = [
......
__version_info__ = ('0', '0', '44')
__version_info__ = ('0', '0', '45')
__version__ = '.'.join(__version_info__)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment