mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mariadb-connector-c: fix Windows build

Browse Source 
--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 <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna 2018-05-30 12:07:46 +02:00
parent 4eb739592d
commit 46ac3e24f6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk vendored
View File

@ -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 \