[gtkmm/use-dllexport: 45/60] gtkmm: Fix building on Visual Studio
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm/use-dllexport: 45/60] gtkmm: Fix building on Visual Studio
- Date: Mon, 8 Jun 2020 02:45:47 +0000 (UTC)
commit 764e0e0403a076ad29800f48e066ec8265f45720
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Jun 4 17:22:04 2020 +0800
gtkmm: Fix building on Visual Studio
When we invoke gendef.exe in this case, we must include both the static gdkmm
library and the (temporary) static gtkmm library, so that we can have the
complete list of symbols that we want to export from the final gtkmm DLL.
gtk/gtkmm/meson.build | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build
index 4d1e98a2..ac5461c4 100644
--- a/gtk/gtkmm/meson.build
+++ b/gtk/gtkmm/meson.build
@@ -462,10 +462,8 @@ if build_shared_libs_directly
install: true,
)
else
- # Building with headers generated from *.hg files with
- # gmmproc < 2.64.3 on Visual Studio: We need this so
- # that we can run gendef.exe to get the .def file
- # needed for obtaining the .lib file for the gtkmm DLL
+ # TODO: Remove this section when headers and gmmproc files are updated
+ # to mark classes and APIs with GDKMM_API and GTKMM_API
gtk_int_lib = static_library('gtkmm-int',
gtk_gen_sources, built_dummy_h_file_target, gtkmm_extra_used_cc_files,
include_directories: extra_include_dirs,
@@ -477,10 +475,11 @@ else
gtkmm_def = custom_target('gtkmm.def',
output: 'gtkmm.def',
- depends: gtk_int_lib,
+ depends: [gdkmm_library, gtk_int_lib],
command: [ gendef,
'@OUTPUT@',
'@0@-@1@.dll'.format(gtkmm_pcname, gtkmm_libversion.split('.')[0]),
+ gdkmm_library.full_path(),
gtk_int_lib.full_path(),
],
install: false,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]