[gtk/wip.win32.fixes: 51/52] Revert "gtk/meson.build: Fix linking on Visual Studio 2013"
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip.win32.fixes: 51/52] Revert "gtk/meson.build: Fix linking on Visual Studio 2013"
- Date: Fri, 11 Jun 2021 02:20:56 +0000 (UTC)
commit 159ff04e6dc33710c7cf83c3942f6bd9d1a59da3
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue May 25 12:33:08 2021 +0800
Revert "gtk/meson.build: Fix linking on Visual Studio 2013"
This reverts commit e208e0e07886248d4d86118aa5591c9882f0ed5c.
gtk/meson.build | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 416be43bdc..e82b481c7e 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1114,28 +1114,11 @@ libgtk_static = static_library('gtk',
link_with: [libgtk_css, libgdk, libgsk ],
)
-# `link_whole:` is actually only supported on Visual Studio 2015 Update 2
-# or later via the linker flag `/WHOLEARCHIVE:<static_lib>`, so we need
-# to work around it for Visual Studio 2013. Note that all needed static
-# libs are required so that we grab the object files from each of them to
-# link the final GTK DLL.
-whole_archives = []
-gtk4_objs = []
-
-if cc.get_id() == 'msvc' and cc.version().split('.').get(0) < '19'
- foreach target : [ libgtk_static, libgtk_css, libgdk, libgdk_win32, libgsk, libgsk_f16c ]
- gtk4_objs += target.extract_all_objects(recursive: false)
- endforeach
-else
- whole_archives = [libgtk_static, libgtk_css, libgdk, libgsk ]
-endif
-
libgtk = shared_library('gtk-4',
c_args: gtk_cargs + common_cflags,
include_directories: [confinc, gdkinc, gskinc, gtkinc],
dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
- link_whole: whole_archives,
- objects: gtk4_objs,
+ link_whole: [libgtk_static, libgtk_css, libgdk, libgsk ],
link_args: common_ldflags,
soversion: gtk_soversion,
version: gtk_library_version,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]