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 /gladeui | |
| 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 'gladeui')
| -rw-r--r-- | gladeui/glade-app.c | 6 | ||||
| -rw-r--r-- | gladeui/glade-previewer.rc.in | 4 | ||||
| -rw-r--r-- | gladeui/gladeui.rc.in | 2 | ||||
| -rw-r--r-- | gladeui/meson.build | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c index c347400b..2942ebad 100644 --- a/gladeui/glade-app.c +++ b/gladeui/glade-app.c @@ -178,10 +178,10 @@ build_package_paths (void) # endif if (!pixmaps_dir) - pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL); + pixmaps_dir = g_build_filename (prefix, "share", PACKAGE_NAME, "pixmaps", NULL); - catalogs_dir = g_build_filename (prefix, "share", PACKAGE, "catalogs", NULL); - modules_dir = g_build_filename (prefix, "lib", PACKAGE, "modules", NULL); + catalogs_dir = g_build_filename (prefix, "share", PACKAGE_NAME, "catalogs", NULL); + modules_dir = g_build_filename (prefix, "lib", PACKAGE_NAME, "modules", NULL); locale_dir = g_build_filename (prefix, "share", "locale", NULL); bin_dir = g_build_filename (prefix, "bin", NULL); lib_dir = g_build_filename (prefix, "lib", NULL); diff --git a/gladeui/glade-previewer.rc.in b/gladeui/glade-previewer.rc.in index 3ec103fa..0250b5b6 100644 --- a/gladeui/glade-previewer.rc.in +++ b/gladeui/glade-previewer.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 @@ -15,7 +15,7 @@ VS_VERSION_INFO VERSIONINFO 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 © 2007 The GNOME Foundation" + VALUE "LegalCopyright", "Copyright 2007 The GNOME Foundation" VALUE "OriginalFilename", "glade-previewer.exe" VALUE "ProductName", "Glade Interface Designer" VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0" diff --git a/gladeui/gladeui.rc.in b/gladeui/gladeui.rc.in index c1ae317c..401d09f2 100644 --- a/gladeui/gladeui.rc.in +++ b/gladeui/gladeui.rc.in @@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO 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 "InternalName", "libgladeui-1-@GLADE_CURRENT_MINUS_AGE@" - VALUE "LegalCopyright", "Copyright © 2007 The GNOME Foundation" + VALUE "LegalCopyright", "Copyright 2007 The GNOME Foundation" VALUE "OriginalFilename", "libgladeui-1-@GLADE_CURRENT_MINUS_AGE@.dll" VALUE "ProductName", "Glade Interface Designer" VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@" diff --git a/gladeui/meson.build b/gladeui/meson.build index 484bf389..8ccf1b4f 100644 --- a/gladeui/meson.build +++ b/gladeui/meson.build @@ -184,8 +184,8 @@ endif if glade_system == 'windows' rc = configure_file( - input: 'glade.rc.in', - output: '@BASELINE@', + input: 'gladeui.rc.in', + output: 'gladeui.rc', configuration: rc_conf, ) @@ -193,8 +193,8 @@ if glade_system == 'windows' ldflags += cc.get_supported_link_arguments([ # gmodule-export-2.0 on windows does not include -export-dynamic flag - '-export-dynamic', - '-no-undefined', + '-Wl,--export-all-symbols', + '-Wl,--no-undefined', ]) endif @@ -264,7 +264,7 @@ ldflags = [] if glade_system == 'windows' rc = configure_file( input: 'glade-previewer.rc.in', - output: '@BASELINE@', + output: 'glade-previewer.rc', configuration: rc_conf, ) |