[glade/glade-3-36.msvc: 7/18] meson: Fix Windows Resource files build
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade/glade-3-36.msvc: 7/18] meson: Fix Windows Resource files build
- Date: Mon, 8 Jun 2020 10:10:41 +0000 (UTC)
commit 9dc86e4fd3e410828dcf25cb86c5a66f1db2ada3
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Jun 2 16:47:39 2020 +0800
meson: Fix Windows Resource files build
@BASELINE@ is not really supported, so just use the .rc filenames without
the .in suffix
Also add include directories as appropriate.
gladeui/meson.build | 8 ++++----
src/meson.build | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gladeui/meson.build b/gladeui/meson.build
index 4dd7bd6d..94324efe 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,
)
@@ -264,11 +264,11 @@ ldflags = []
if glade_system == 'windows'
rc = configure_file(
input: 'glade-previewer.rc.in',
- output: '@BASELINE@',
+ output: 'glade-previewer.rc',
configuration: rc_conf,
)
- sources += windows.compile_resources(rc)
+ sources += windows.compile_resources(rc, include_directories: include_directories('.'))
if not glade_unstable
ldflags += cc.get_supported_link_arguments('-mwindows')
diff --git a/src/meson.build b/src/meson.build
index 9f82db95..a5bdbfcd 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -35,11 +35,11 @@ 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)
+ sources += windows.compile_resources(rc, include_directories: include_directories('.'))
test_ldflags = ['-export-dynamic']
if not glade_unstable
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]