Add build icon in executable and gate more linux stuff with meson

Author: teamcons

data/meson.build

@@ -5,53 +5,53 @@ install_data (
     rename: meson.project_name() + '.gschema.xml'
 )
 
-#======== Internationalization ========
-#Translate and install our .desktop file
-i18n.merge_file(
-    input: 'jorts.desktop.in',
-    output: meson.project_name() + '.desktop',
-    po_dir: meson.project_source_root() / 'po' / 'extra',
-    type: 'desktop',
-    install: true,
-    install_dir: get_option('datadir') / 'applications'
-)
-
-
-# metainfo confuses windows
+# metainfo confuses windows, and icons are 
 if not windows_build
 
-#Translate and install our .metainfo file
-i18n.merge_file(
-    input: 'jorts.metainfo.xml.in',
-    output: meson.project_name() + '.metainfo.xml',
-    po_dir: meson.project_source_root() / 'po' / 'extra',
-    install: true,
-    install_dir: get_option('datadir') / 'metainfo'
-)
-
-endif
+    #======== Internationalization ========
+    #Translate and install our .desktop file
+    i18n.merge_file(
+        input: 'jorts.desktop.in',
+        output: meson.project_name() + '.desktop',
+        po_dir: meson.project_source_root() / 'po' / 'extra',
+        type: 'desktop',
+        install: true,
+        install_dir: get_option('datadir') / 'applications'
+    )
 
-#======== ICONS ========
+    #======== Metainfo ========
+    #Translate and install our .metainfo file
+    i18n.merge_file(
+        input: 'jorts.metainfo.xml.in',
+        output: meson.project_name() + '.metainfo.xml',
+        po_dir: meson.project_source_root() / 'po' / 'extra',
+        install: true,
+        install_dir: get_option('datadir') / 'metainfo'
+    )
 
-# Install our icons in all the required sizes
-# "variant" variable has been declared earlier in the base meson
-icon_sizes = ['16', '24', '32', '48', '64', '128']
+    #======== ICONS ========
+    # Install our icons in all the required sizes
+    # "variant" variable has been declared earlier in the base meson
+    icon_sizes = ['16', '24', '32', '48', '64', '128']
+
+    foreach i : icon_sizes
+        install_data(
+            'icons' / variant / 'hicolor' / i + '.png',
+            install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps',
+            rename: meson.project_name() + '.png'
+        )
+        install_data(
+            'icons' / variant / 'hicolor@2' / i + '@2.png',
+            install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i + '@2' / 'apps',
+            rename: meson.project_name() + '.png'
+        )
+    endforeach
 
-foreach i : icon_sizes
-    install_data(
-        'icons' / variant / 'hicolor' / i + '.png',
-        install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps',
-        rename: meson.project_name() + '.png'
-    )
     install_data(
-        'icons' / variant / 'hicolor@2' / i + '@2.png',
-        install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i + '@2' / 'apps',
-        rename: meson.project_name() + '.png'
+        'icons' / variant / 'scalable.svg',
+        install_dir: get_option('datadir') / 'icons' / 'scalable' / 'apps',
+        rename: meson.project_name() + '.svg'
     )
-endforeach
 
-install_data(
-    'icons' / variant / 'scalable.svg',
-    install_dir: get_option('datadir') / 'icons' / 'scalable' / 'apps',
-    rename: meson.project_name() + '.svg'
-)
+endif
+

meson.build

@@ -67,6 +67,8 @@ dependencies = [
 
 if windows_build
     dependencies += dependency('gio-windows-2.0')
+    ico_src = import('windows').compile_resources('windows/icons/ico.rc', depends: windows/icons/icon.ico)
+
 else
     dependencies += dependency('gio-unix-2.0')
     dependencies += dependency('libportal')

src/meson.build

@@ -30,18 +30,22 @@ sources = files (
     'Application.vala',
 )
 
-if not windows_build
+if windows_build
+    sources += ico_src
+else
     sources += files('Utils' / 'Libportal.vala')
 endif
 
 #================================
 # Let's define our executable
+# win_subsystem doesnt seem to bother standard builds
+
 executable(
     meson.project_name(),
     gresource,
     config_file,
     sources,
     dependencies: dependencies,
-   win_subsystem: 'windows',
+    win_subsystem: 'windows',
     install : true
 )

windows/icons/ico.rc

@@ -0,0 +1 @@
+JORTS_ICON ICON "icon.ico"

windows/prep.sh

@@ -13,4 +13,4 @@ pacman -S mingw-w64-libgee mingw-w64-gsettings-desktop-schemas
 pacman -S mingw-w64-x86_64-desktop-file-utils
 pacman -S mingw-w64-x86_64-gtk-elementary-theme mingw-w64-x86_64-elementary-icon-theme
 pacman -S mingw-w64-ucrt-x86_64-vala mingw-w64-x86_64-vala
-
+pacman -S mingw-w64-x86_64-librsvg