diff options
| author | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2020-10-06 20:34:11 -0300 |
|---|---|---|
| committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2020-10-09 17:11:16 -0300 |
| commit | 20142e2ad10727e1b9ff5693f15f587ff70a0e39 (patch) | |
| tree | c812cc875283b61ea203c3da629d7d2853bb1392 /src | |
| parent | 9f4097cd74f95ec18428b56d99d814151de9e4fa (diff) | |
| download | glade-20142e2ad10727e1b9ff5693f15f587ff70a0e39.tar.gz | |
Fix windows build on msys
Use -Wl,--export-all-symbols and -Wl,--no-undefined to export
symbols on mingw
GladeApp: use PACKAGE_NAME instead of PACKAGE
Remove copyright symbol from resource files to avoid weird UTF error
building with mingw on msys
Diffstat (limited to 'src')
| -rw-r--r-- | src/glade-http.c | 1 | ||||
| -rw-r--r-- | src/glade.rc.in | 6 | ||||
| -rw-r--r-- | src/meson.build | 18 |
3 files changed, 19 insertions, 6 deletions
diff --git a/src/glade-http.c b/src/glade-http.c index 3db8d81b..457ef977 100644 --- a/src/glade-http.c +++ b/src/glade-http.c @@ -22,6 +22,7 @@ #include <glade-http.h> #include <string.h> #include <stdio.h> +#include <stdlib.h> struct _GladeHTTPPrivate { diff --git a/src/glade.rc.in b/src/glade.rc.in index 6669a2cc..fbd02432 100644 --- a/src/glade.rc.in +++ b/src/glade.rc.in @@ -1,6 +1,6 @@ #include <winver.h> -GLADE_ICON ICON "../data/icons/glade.ico" +GLADE_ICON ICON "@SOURCE_ROOT@/data/icons/glade.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @GLADE_MAJOR_VERSION@,@GLADE_MINOR_VERSION@,@GLADE_MICRO_VERSION@,0 @@ -12,10 +12,10 @@ VS_VERSION_INFO VERSIONINFO BEGIN BLOCK "040904B0" BEGIN - VALUE "CompanyName", "GNOME Foundation" + VALUE "CompanyName", "The GNOME Foundation" VALUE "FileDescription", "Glade Interface Designer @GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@" VALUE "FileVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0" - VALUE "LegalCopyright", "Copyright © 2012 The GNOME Foundation" + VALUE "LegalCopyright", "Copyright 2012 The GNOME Foundation" VALUE "OriginalFilename", "glade.exe" VALUE "ProductName", "Glade Interface Designer" VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0" diff --git a/src/meson.build b/src/meson.build index 0b30027c..25038d47 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,4 +1,16 @@ -vcs_tag(input: 'version.h.in', output: 'version.h') +fs = import('fs') + +if fs.exists('../.git') + vcs_tag(input: 'version.h.in', output: 'version.h') +else + config = configuration_data() + config.set ('VCS_TAG', glade_version) + configure_file( + input: 'version.h.in', + output: 'version.h', + configuration: config + ) +endif sources = files( 'glade-http.c', @@ -39,13 +51,13 @@ ldflags = [] if glade_system == 'windows' rc = configure_file( input: 'glade.rc.in', - output: '@BASELINE@', + output: 'glade.rc', configuration: rc_conf, ) sources += windows.compile_resources(rc) - test_ldflags = ['-export-dynamic'] + test_ldflags = ['-Wl,--export-all-symbols'] if not glade_unstable test_ldflags += ['-mwindows'] endif |