Merge pull request #57 from squidowl/icons-windows

add windows icon
squidowl · Jun 27, 2023 · 6d88c0a · 6d88c0a
2 parents 10690b7 + 1230722
commit 6d88c0a
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 1 deletion.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,10 @@ jobs:
             os: macos-latest
             make: bash scripts/build-macos.sh
             binary_path: target/release/macos/halloy.dmg
-
+          - target: windows
+            os: windows-latest
+            make: bash scripts/build-windows.sh
+            binary_path: target/release/halloy.exe
     runs-on: ${{ matrix.target.os }}
 
     steps:
@@ -67,6 +70,10 @@ jobs:
             artifact_name: halloy.dmg
             asset_name: halloy.dmg
             asset_type: application/octet-stream
+          - artifact: windows
+            artifact_name: halloy.exe
+            asset_name: halloy.exe
+            asset_type: application/x-dosexec
 
     runs-on: ubuntu-latest
     env:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,6 +20,9 @@ tokio = { version = "1.0", features = ["rt", "fs", "process"] }
 unicode-segmentation = "1.6"
 open = "4.1.0"
 
+[build-dependencies]
+embed-resource = "2.1.1"
+
 [dependencies.uuid]
 version = "1.0"
 features = ["v4"]

diff --git a/assets/windows/halloy.ico b/assets/windows/halloy.ico
diff --git a/assets/windows/halloy.manifest b/assets/windows/halloy.manifest
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+      <dpiAwareness>PerMonitorV2, unaware</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
diff --git a/assets/windows/halloy.rc b/assets/windows/halloy.rc
@@ -0,0 +1,7 @@
+#define IDI_ICON 0x101
+
+IDI_ICON ICON "halloy.ico"
+
+#define RT_MANIFEST 24
+
+1 RT_MANIFEST "halloy.manifest"
diff --git a/build.rs b/build.rs
@@ -0,0 +1,6 @@
+extern crate embed_resource;
+
+fn main() {
+    #[cfg(windows)]
+    embed_resource::compile("assets/windows/halloy.rc", embed_resource::NONE);
+}
diff --git a/scripts/build-windows.sh b/scripts/build-windows.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# build binary
+rustup target add x86_64-pc-windows-msvc
+cargo build --release --target=x86_64-pc-windows-msvc
diff --git a/src/main.rs b/src/main.rs
@@ -1,4 +1,5 @@
 #![allow(clippy::large_enum_variant, clippy::too_many_arguments)]
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 mod buffer;
 mod event;