From 889ea99f62dd010c168cce6b18f0d49fb2a48203 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/30] Fix linking against shared/static MariaDB --- src/sql/configure.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sql/configure.json b/src/sql/configure.json index 96c82e84f9..fce948026f 100644 --- a/src/sql/configure.json +++ b/src/sql/configure.json @@ -58,6 +58,9 @@ "label": "MySQL", "test": "unix/mysql", "sources": [ + { "libs": "-lmariadbclient -lssl -lcrypto -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" }, + { "libs": "-Wl,-Bdynamic -lmariadb -Wl,-Bstatic", "condition": "config.win32 && !features.shared" }, + { "libs": "-lmariadb", "condition": "config.win32 && features.shared" }, { "type": "mysqlConfig", "query": "--libs_r" }, { "type": "mysqlConfig", "query": "--libs" }, { "libs": "-lmysqlclient_r", "condition": "!config.win32" }, -- 2.12.1