diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-08-16 16:35:17 +0200 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2018-08-24 17:19:51 +0200 |
| commit | 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 (patch) | |
| tree | 0d36eda88da5d9f1a28a5b915494d08c55456a02 /RepositoryExternal.mk | |
| parent | 84c02b6d9f2fbe6658b58182f57d60e2bc797016 (diff) | |
Moving mysqlc into connectivity as a library
Additionally I erased the remains of the old mysql C++ connector.
Also update the code where the clang plugins were unhappy after moving
the mysqlc module.
Remove mysql-cpp-connector external.
Change-Id: I771cc7afacf5012fc349afb6b36828fb0fee5a66
Reviewed-on: https://gerrit.libreoffice.org/59200
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 788840851726..f0acedbf654e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -228,8 +228,11 @@ endef endif # SYSTEM_EPOXY define gb_LinkTarget__use_iconv +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),libiconv.lib) +else $(call gb_LinkTarget_add_libs,$(1),-liconv) - +endif endef ifneq ($(SYSTEM_MARIADB_CONNECTOR_C),) |