[gupnp-tools/wip/new-upnp: 4/4] build: Fix missing windows things
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp-tools/wip/new-upnp: 4/4] build: Fix missing windows things
- Date: Sun, 11 Nov 2018 07:47:02 +0000 (UTC)
commit 4bb034aceb48936e6a25d8060a8578361de1e42f
Author: Jens Georg <mail jensge org>
Date: Sun Nov 11 08:45:50 2018 +0100
build: Fix missing windows things
- Add icons for executables
- Compile the GUI apps as gui apps
meson.build | 4 ++++
src/av-cp/meson.build | 12 ++++++++++--
src/network-light/meson.build | 12 ++++++++++--
src/universal-cp/meson.build | 9 ++++++++-
4 files changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index b7af4d5..ea2fe0b 100644
--- a/meson.build
+++ b/meson.build
@@ -3,6 +3,10 @@ project('gupnp-tools', ['c'], version: '0.8.15')
gnome = import('gnome')
i18n = import('i18n')
+if host_machine.system() == 'windows'
+ win = import('windows')
+endif
+
gssdp = dependency('gssdp-1.2', version: '>= 1.1')
gupnp = dependency('gupnp-1.2', version: '>= 1.1')
soup = dependency('libsoup-2.4', version: '>= 2.42')
diff --git a/src/av-cp/meson.build b/src/av-cp/meson.build
index 59955ee..00bf411 100644
--- a/src/av-cp/meson.build
+++ b/src/av-cp/meson.build
@@ -1,3 +1,9 @@
+if host_machine.system() == 'windows'
+ av_cp_win_resources = win.compile_resources('av-cp.rc')
+else
+ av_cp_win_resources = []
+endif
+
av_cp_resources = gnome.compile_resources('av-cp-resource',
join_paths(resource_data, 'org.gupnp.Tools.AV-CP.gresource.xml'),
source_dir : resource_data,
@@ -19,7 +25,9 @@ executable('gupnp-av-cp',
'search-dialog.c',
'search-dialog.h',
'server-device.c',
- 'server-device.h'] + av_cp_resources,
+ 'server-device.h'] + av_cp_resources + av_cp_win_resources,
dependencies : [gupnp, gssdp, gupnp_av, gtk, util, gtksourceview, config_header],
export_dynamic : true,
- install : true)
+ install : true,
+ gui_app : true
+ )
diff --git a/src/network-light/meson.build b/src/network-light/meson.build
index daf1a27..2017709 100644
--- a/src/network-light/meson.build
+++ b/src/network-light/meson.build
@@ -1,3 +1,9 @@
+if host_machine.system() == 'windows'
+ network_light_win_resources = win.compile_resources('av-cp.rc')
+else
+ network_light_win_resources = []
+endif
+
network_light_resource = gnome.compile_resources('network-light-resource',
join_paths(resource_data, 'org.gupnp.Tools.Network-Light.gresource.xml'),
source_dir : resource_data)
@@ -10,7 +16,9 @@ executable('gupnp-network-light',
'main.h',
'upnp.c',
'upnp.h'
- ] + network_light_resource,
+ ] + network_light_resource + network_light_win_resources,
export_dynamic: true,
install : true,
- dependencies : [gupnp, gtk, util, gssdp, config_header])
+ dependencies : [gupnp, gtk, util, gssdp, config_header],
+ gui_app : true
+ )
diff --git a/src/universal-cp/meson.build b/src/universal-cp/meson.build
index 7e46524..8554a13 100644
--- a/src/universal-cp/meson.build
+++ b/src/universal-cp/meson.build
@@ -1,3 +1,9 @@
+if host_machine.system() == 'windows'
+ universal_cp_win_resources = win.compile_resources('av-cp.rc')
+else
+ universal_cp_win_resources = []
+endif
+
universal_cp_resource = gnome.compile_resources('universal-cp-resource',
join_paths(resource_data, 'org.gupnp.Tools.Universal-CP.gresource.xml'),
source_dir : resource_data)
@@ -16,8 +22,9 @@ executable('gupnp-universal-cp',
'gui.h',
'main.c',
'main.h'
- ] + universal_cp_resource,
+ ] + universal_cp_resource + universal_cp_win_resources,
export_dynamic: true,
install : true,
+ gui_app : true,
dependencies : [util, glib, gupnp, gtk, gssdp, config_header])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]