diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2017-12-14 13:32:56 +0100 |
|---|---|---|
| committer | Christoph Reiter <creiter@src.gnome.org> | 2018-01-04 22:19:30 +0100 |
| commit | aa7c5cbdcbe8b22f019c29668bcbe57d53f9866d (patch) | |
| tree | e113a90aeee3adc917a8b76c2bf763bed529a4aa /gmodule | |
| parent | 0e7b82abb93aeb6fdf374d9e1e4fd4f4636a11f8 (diff) | |
| download | glib-aa7c5cbdcbe8b22f019c29668bcbe57d53f9866d.tar.gz | |
meson: build Windows resource files
configure_file() forces utf-8 atm but .rc files are not utf-8.
To work around the issue just remove the only non-ASCII char.
https://bugzilla.gnome.org/show_bug.cgi?id=784995
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/gmodule.rc.in | 2 | ||||
| -rw-r--r-- | gmodule/meson.build | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gmodule/gmodule.rc.in b/gmodule/gmodule.rc.in index 0def0a92f..c3d762da9 100644 --- a/gmodule/gmodule.rc.in +++ b/gmodule/gmodule.rc.in @@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "GModule" VALUE "FileVersion", "@GLIB_VERSION@.0" VALUE "InternalName", "libgmodule-2.0-@LT_CURRENT_MINUS_AGE@" - VALUE "LegalCopyright", "Copyright © 1998-2011 Tim Janik and others." + VALUE "LegalCopyright", "Copyright 1998-2011 Tim Janik and others." VALUE "OriginalFilename", "libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll" VALUE "ProductName", "GLib" VALUE "ProductVersion", "@GLIB_VERSION@" diff --git a/gmodule/meson.build b/gmodule/meson.build index 191bca244..be1fff308 100644 --- a/gmodule/meson.build +++ b/gmodule/meson.build @@ -84,8 +84,19 @@ gmoduleconf_h = configure_file(input : 'gmoduleconf.h.in', install_headers(['gmodule.h'], subdir : 'glib-2.0') +gmodule_sources = ['gmodule.c'] +if host_system == 'windows' + gmodule_win_rc = configure_file( + input: 'gmodule.rc.in', + output: 'gmodule.rc', + configuration: glibconfig_conf, + ) + gmodule_win_res = windows.compile_resources(gmodule_win_rc) + gmodule_sources += [gmodule_win_res] +endif + libgmodule = shared_library('gmodule-2.0', - sources : ['gmodule.c'], + sources : gmodule_sources, version : library_version, soversion : soversion, install : true, |