From da2c4acc4e2e51252d2ef1751bc77966be32ec80 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 29 Aug 2018 16:03:30 +0200 Subject: Add source for zero stub mysqllo.dll (MSP needs it) Change-Id: Ia36bbd0bd7c1f650366215bfc70b0ced5b96e70a --- Repository.mk | 1 + connectivity/Library_mysql.mk | 20 ++++++++++++++++++++ connectivity/Module_connectivity.mk | 1 + connectivity/source/drivers/mysqlc/mysql_dummy.cxx | 20 ++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 connectivity/Library_mysql.mk create mode 100644 connectivity/source/drivers/mysqlc/mysql_dummy.cxx diff --git a/Repository.mk b/Repository.mk index 5cfe4a115f91..6c617dd2843b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -390,6 +390,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(call gb_Helper_optional,SCRIPTING,msforms) \ mtfrenderer \ $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \ + $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \ odbc \ odfflatxml \ offacc \ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk new file mode 100644 index 000000000000..f82593c23d2e --- /dev/null +++ b/connectivity/Library_mysql.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, you can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Library_Library,mysql)) + +$(eval $(call gb_Library_use_libraries,mysql,\ + sal \ +)) + +$(eval $(call gb_Library_add_exception_objects,mysql,\ + connectivity/source/drivers/mysqlc/mysql_dummy \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 0fc587daa340..250172e936a1 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -83,6 +83,7 @@ ifeq ($(ENABLE_MARIADBC),TRUE) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_mysql \ Library_mysqlc \ + Library_mysql \ )) endif diff --git a/connectivity/source/drivers/mysqlc/mysql_dummy.cxx b/connectivity/source/drivers/mysqlc/mysql_dummy.cxx new file mode 100644 index 000000000000..05d4cc35b69e --- /dev/null +++ b/connectivity/source/drivers/mysqlc/mysql_dummy.cxx @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include + +using namespace com::sun::star; + +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( + const sal_Char* /*pImplementationName*/, void* /*pServiceManager*/, void* /*pRegistryKey*/) +{ + return nullptr; +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit