27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From 370cd6e5833f50acbd4fdfdef5d1b8465f369696 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 18:56:55 +0200
|
|
Subject: [PATCH 13/31] Fix linking against shared/static MariaDB
|
|
|
|
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
|
|
---
|
|
src/plugins/sqldrivers/configure.json | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
|
|
index 28ccbeadcd..7262914c64 100644
|
|
--- a/src/plugins/sqldrivers/configure.json
|
|
+++ b/src/plugins/sqldrivers/configure.json
|
|
@@ -67,6 +67,8 @@
|
|
},
|
|
"headers": "mysql.h",
|
|
"sources": [
|
|
+ { "libs": "-lmariadbclient -lssl -lcrypto -lshlwapi -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
|
|
+ { "libs": "-lmariadb", "condition": "config.win32 && features.shared" },
|
|
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
|
|
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
|
|
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
|
|
--
|
|
2.31.1
|
|
|