From 46ac3e24f65ee69154afa6ba93997635629f79c0 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 30 May 2018 12:07:46 +0200 Subject: [PATCH] mariadb-connector-c: fix Windows build --enable-ext-mariadb-connector is not the default, this fixes the build after using that switch up to the mariadb-connector-c module. mysql-connector-cpp is still broken, VS 2015 gives internal compiler error there for the used boost pieces... Change-Id: I1845cde03d5166594aac67c23e61186920ab3785 Reviewed-on: https://gerrit.libreoffice.org/55055 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- .../StaticLibrary_mariadb-connector-c.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk index 952f69a78d86..34c61eaddf87 100644 --- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk @@ -25,6 +25,14 @@ $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\ ## (but then need to add "-lssl -lcrypto -lz" to mysqlcppconn linking) $(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1)) +ifeq ($(OS),WNT) +$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED -DHAVE_STRTOULL)) +$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\ + $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \ +)) +endif + $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\ UnpackedTarball/mariadb-connector-c/libmariadb/array \ UnpackedTarball/mariadb-connector-c/libmariadb/ma_dyncol \