luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-04 01:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'compile-windows-resources-only-shared' into 'main'

Browse Source 
gio, gmodule, gthread: compile windows resources only in shared build

See merge request GNOME/glib!3842
This commit is contained in:
Philip Withnall
2024-01-21 20:42:15 +00:00
parent 75310f658d c65e163240
commit ca0e7c376a
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gio/meson.build
View File

@@ -458,13 +458,15 @@ else
'gwin32sid.h',
)
gio_win_rc = configure_file(
input: 'gio.rc.in',
output: 'gio.rc',
configuration: glibconfig_conf,
)
gio_win_res = windows.compile_resources(gio_win_rc)
win32_sources += [gio_win_res]
if glib_build_shared
gio_win_rc = configure_file(
input: 'gio.rc.in',
output: 'gio.rc',
configuration: glibconfig_conf,
)
gio_win_res = windows.compile_resources(gio_win_rc)
win32_sources += [gio_win_res]
endif
gio_win32_include_headers = files(
'gregistrysettingsbackend.h',

2
gmodule/meson.build
View File

@@ -80,7 +80,7 @@ gmodule_visibility_h = custom_target(
gmodule_sources = [gmodule_c, gmodule_visibility_h, gmodule_deprecated_c]
if host_system == 'windows'
if host_system == 'windows' and glib_build_shared
gmodule_win_rc = configure_file(
input: 'gmodule.rc.in',
output: 'gmodule.rc',

2
gthread/meson.build
View File

@@ -2,7 +2,7 @@
# has been moved into glib now
gthread_sources = ['gthread-impl.c']
if host_system == 'windows'
if host_system == 'windows' and glib_build_shared
gthread_win_rc = configure_file(
input: 'gthread.rc.in',
output: 'gthread.rc',