luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: build Windows resource files

Browse Source 
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
This commit is contained in:
Christoph Reiter
2017-12-14 13:32:56 +01:00
committed by Christoph Reiter
parent 0e7b82abb9
commit aa7c5cbdcb
11 changed files with 57 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gmodule/gmodule.rc.in
View File

@@ -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 <20> 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@"

13
gmodule/meson.build
View File

@@ -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,