summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-03-05 01:03:23 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2020-03-05 01:03:23 +0200
commit0af36dc4aba007beb33a720f2322123c324aad63 (patch)
tree0c5ec02ea0ceeeb3dca89e2cc0771d9c0c6336fe
parente197f6453b290c7bf81fb3e4993d54a000bcaf78 (diff)
Build some bridges.
Change-Id: I6aec0afae38a63d9f79ca6e08d755de39a1e993d
-rw-r--r--bridges/meson.build25
-rw-r--r--config_host/config_cxxabi.h.meson26
-rw-r--r--config_host/meson.build15
-rw-r--r--cppu/meson.build2
-rw-r--r--meson.build3
-rw-r--r--vcl/meson.build2
6 files changed, 70 insertions, 3 deletions
diff --git a/bridges/meson.build b/bridges/meson.build
new file mode 100644
index 000000000000..839a3fb51797
--- /dev/null
+++ b/bridges/meson.build
@@ -0,0 +1,25 @@
+_uno_lib = shared_library('gcc3_uno',
+ 'source/cpp_uno/shared/cppinterfaceproxy.cxx',
+ 'source/cpp_uno/shared/bridge.cxx',
+ 'source/cpp_uno/shared/component.cxx',
+ 'source/cpp_uno/shared/types.cxx',
+ 'source/cpp_uno/shared/unointerfaceproxy.cxx',
+ 'source/cpp_uno/shared/vtablefactory.cxx',
+ 'source/cpp_uno/shared/vtables.cxx',
+ 'source/cpp_uno/gcc3_linux_x86-64/abi.cxx',
+ 'source/cpp_uno/gcc3_linux_x86-64/abi.hxx',
+ 'source/cpp_uno/gcc3_linux_x86-64/call.s',
+ 'source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx',
+ 'source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx',
+ 'source/cpp_uno/gcc3_linux_x86-64/except.cxx',
+ 'source/cpp_uno/gcc3_linux_x86-64/rtti.cxx',
+ 'source/cpp_uno/gcc3_linux_x86-64/share.hxx',
+ 'source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx',
+ udk_fake_h, off_fake_h,
+ cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+ include_directories: [main_inc, 'inc', udkh_inc, offapi_inc],
+ link_with: [cppu_lib, sal_lib],
+ dependencies: [dl_dep],
+ install: true,
+)
+
diff --git a/config_host/config_cxxabi.h.meson b/config_host/config_cxxabi.h.meson
new file mode 100644
index 000000000000..9259dc0bb94b
--- /dev/null
+++ b/config_host/config_cxxabi.h.meson
@@ -0,0 +1,26 @@
+/* -*- 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/.
+ */
+
+#ifndef CONFIG_CXXABI_H
+#define CONFIG_CXXABI_H
+
+#mesondefine HAVE_CXXABI_H_BASE_CLASS_TYPE_INFO
+#mesondefine HAVE_CXXABI_H_CLASS_TYPE_INFO
+#mesondefine HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION
+#mesondefine HAVE_CXXABI_H_CXA_EH_GLOBALS
+#mesondefine HAVE_CXXABI_H_CXA_EXCEPTION
+#mesondefine HAVE_CXXABI_H_CXA_GET_GLOBALS
+#mesondefine HAVE_CXXABI_H_CXA_CURRENT_EXCEPTION_TYPE
+#mesondefine HAVE_CXXABI_H_CXA_THROW
+#mesondefine HAVE_CXXABI_H_SI_CLASS_TYPE_INFO
+#mesondefine HAVE_CXXABI_H_VMI_CLASS_TYPE_INFO
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/config_host/meson.build b/config_host/meson.build
index e598bff38b50..24df74456933 100644
--- a/config_host/meson.build
+++ b/config_host/meson.build
@@ -93,6 +93,17 @@ cdata.set_quoted('PYTHON_VERSION_STRING', '3.2.1')
cdata.set10('ENABLE_FIREBIRD_SDBC', false)
cdata.set10('HAVE_FIREBIRD_30', false)
+cdata.set10('HAVE_CXXABI_H_BASE_CLASS_TYPE_INFO', true)
+cdata.set10('HAVE_CXXABI_H_CLASS_TYPE_INFO', true)
+cdata.set10('HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION', true)
+cdata.set10('HAVE_CXXABI_H_CXA_EH_GLOBALS', false)
+cdata.set10('HAVE_CXXABI_H_CXA_EXCEPTION', false)
+cdata.set10('HAVE_CXXABI_H_CXA_GET_GLOBALS', true)
+cdata.set10('HAVE_CXXABI_H_CXA_CURRENT_EXCEPTION_TYPE', true)
+cdata.set10('HAVE_CXXABI_H_CXA_THROW', true)
+cdata.set10('HAVE_CXXABI_H_SI_CLASS_TYPE_INFO', true)
+cdata.set10('HAVE_CXXABI_H_VMI_CLASS_TYPE_INFO', true)
+
configure_file(input: 'config_typesizes.h.meson',
output: 'config_typesizes.h',
configuration: cdata)
@@ -220,3 +231,7 @@ configure_file(input: 'config_python.h.meson',
configure_file(input: 'config_firebird.h.meson',
output: 'config_firebird.h',
configuration: cdata)
+
+configure_file(input: 'config_cxxabi.h.meson',
+ output: 'config_cxxabi.h',
+ configuration: cdata)
diff --git a/cppu/meson.build b/cppu/meson.build
index 307e9985cbc4..974e30c75ad0 100644
--- a/cppu/meson.build
+++ b/cppu/meson.build
@@ -22,7 +22,7 @@ cppu_lib = shared_library('cppu',
udk_fake_h,
include_directories: [main_inc, udkh_inc],
cpp_args: ['-DLIBO_INTERNAL_ONLY',
- '-DCPPU_IMPLEMENTATION'],
+ '-DCPPU_DLLIMPLEMENTATION'],
link_with: [salhelper_lib, sal_lib],
install: true,
)
diff --git a/meson.build b/meson.build
index 474790f89c6d..b5f33a0becb4 100644
--- a/meson.build
+++ b/meson.build
@@ -25,7 +25,7 @@ if host_machine.system() == 'linux'
add_global_arguments('-DX86_64', language: 'cpp')
add_global_arguments('-DX86_64', language: 'c')
add_global_arguments('-DCPPU_ENV=gcc3', language: 'cpp')
- rtl_os = 'linux'
+ rtl_os = 'Linux'
elif host_machine.system() == 'windows'
# HACK: just random values thrown in to make
# sal compile.
@@ -236,3 +236,4 @@ subdir('svgio')
subdir('dbaccess')
subdir('reportdesign')
subdir('wizards')
+subdir('bridges')
diff --git a/vcl/meson.build b/vcl/meson.build
index e370b72cad99..ea1d68374a9b 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -430,7 +430,7 @@ vcl_lib = shared_library('vcl',
)
-vclplug_gtk3 = shared_library('vclplug_gtk3',
+vclplug_gtk3 = shared_library('vclplug_gtk3lo',
'unx/gtk3/a11y/gtk3atkaction.cxx',
'unx/gtk3/a11y/gtk3atkbridge.cxx',
'unx/gtk3/a11y/gtk3atkcomponent.cxx',