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 /gthread | |
| 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 'gthread')
| -rw-r--r-- | gthread/gthread.rc.in | 2 | ||||
| -rw-r--r-- | gthread/meson.build | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/gthread/gthread.rc.in b/gthread/gthread.rc.in index a1abc5600..9e45fdff9 100644 --- a/gthread/gthread.rc.in +++ b/gthread/gthread.rc.in @@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "GThread" VALUE "FileVersion", "@GLIB_VERSION@.0" VALUE "InternalName", "libgthread-2.0-@LT_CURRENT_MINUS_AGE@" - VALUE "LegalCopyright", "Copyright © 1995-2011 Peter Mattis, Spencer Kimball, Josh MacDonald, Sebastian Wilhelmi and others." + VALUE "LegalCopyright", "Copyright 1995-2011 Peter Mattis, Spencer Kimball, Josh MacDonald, Sebastian Wilhelmi and others." VALUE "OriginalFilename", "libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll" VALUE "ProductName", "GLib" VALUE "ProductVersion", "@GLIB_VERSION@" diff --git a/gthread/meson.build b/gthread/meson.build index 8ccac3369..7d1120e73 100644 --- a/gthread/meson.build +++ b/gthread/meson.build @@ -1,7 +1,19 @@ # Just a skeleton lib for backwards compatibility since all the functionaliy # has been moved into glib now + +gthread_sources = ['gthread-impl.c'] +if host_system == 'windows' + gthread_win_rc = configure_file( + input: 'gthread.rc.in', + output: 'gthread.rc', + configuration: glibconfig_conf, + ) + gthread_win_res = windows.compile_resources(gthread_win_rc) + gthread_sources += [gthread_win_res] +endif + libgthread = shared_library('gthread-2.0', - sources : [ 'gthread-impl.c' ], + sources : gthread_sources, version : library_version, soversion : soversion, install : true, |