mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-23 22:16:16 +01:00
gio, gmodule, gthread: compile windows resources only in shared build
When linking static libraries, multiple resources is an error unless handled in a special way. glib and gobject do not have this problem, as they already only include resources when building a shared lib.
This commit is contained in:
parent
75310f658d
commit
c65e163240
@ -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',
|
||||
|
@ -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,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',
|
||||
|
Loading…
Reference in New Issue
Block a user