[glade/glade-3-36.msvc: 16/18] Meson: Add a 'lib' prefix for the plugins on MSVC
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade/glade-3-36.msvc: 16/18] Meson: Add a 'lib' prefix for the plugins on MSVC
- Date: Mon, 8 Jun 2020 10:11:27 +0000 (UTC)
commit 940606b4b477b0637bdecee096ee892afc2b1b42
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jun 8 17:55:10 2020 +0800
Meson: Add a 'lib' prefix for the plugins on MSVC
Otherwise GladUI is not going to find the modules.
plugins/gladeui/meson.build | 2 +-
plugins/gtk+/meson.build | 2 +-
plugins/meson.build | 4 ++++
plugins/python/meson.build | 2 +-
plugins/webkit2gtk/meson.build | 2 +-
5 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/plugins/gladeui/meson.build b/plugins/gladeui/meson.build
index 7e28808e..5677fce9 100644
--- a/plugins/gladeui/meson.build
+++ b/plugins/gladeui/meson.build
@@ -4,7 +4,7 @@ sources = files(
)
shared_module(
- 'gladeglade',
+ '@0@gladeglade'.format(module_prefix),
sources: sources,
dependencies: libgladeui_dep,
c_args: '-DG_LOG_DOMAIN="GladeUI-Glade"',
diff --git a/plugins/gtk+/meson.build b/plugins/gtk+/meson.build
index f86dafeb..8180ba19 100644
--- a/plugins/gtk+/meson.build
+++ b/plugins/gtk+/meson.build
@@ -230,7 +230,7 @@ sources += gnome.compile_resources(
)
shared_module(
- 'gladegtk',
+ '@0@gladegtk'.format(module_prefix),
sources: sources,
dependencies: libgladeui_dep,
c_args: '-DG_LOG_DOMAIN="GladeUI-GTK"',
diff --git a/plugins/meson.build b/plugins/meson.build
index 1a7a47eb..b6cae862 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,6 +1,10 @@
ldflags = []
+module_prefix = ''
if glade_system == 'windows'
ldflags += cc.get_supported_link_arguments('-no-undefined')
+ if cc.get_argument_syntax() == 'msvc'
+ module_prefix = 'lib'
+ endif
endif
plugins_kwargs = {
diff --git a/plugins/python/meson.build b/plugins/python/meson.build
index 73ecc8c8..0e9ede31 100644
--- a/plugins/python/meson.build
+++ b/plugins/python/meson.build
@@ -5,7 +5,7 @@ deps = [
]
shared_module(
- 'gladepython',
+ '@0@gladepython'.format(module_prefix),
sources: 'glade-python.c',
dependencies: deps,
c_args: '-DG_LOG_DOMAIN="GladeUI-PYTHON"',
diff --git a/plugins/webkit2gtk/meson.build b/plugins/webkit2gtk/meson.build
index a8306f10..04f032f6 100644
--- a/plugins/webkit2gtk/meson.build
+++ b/plugins/webkit2gtk/meson.build
@@ -4,7 +4,7 @@ deps = [
]
shared_module(
- 'gladewebkit2gtk',
+ '@0@gladewebkit2gtk'.format(module_prefix),
sources: 'glade-webkit2gtk.c',
dependencies: deps,
c_args: '-DG_LOG_DOMAIN="GladeUI-WEBKIT2GTK"',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]