Cute icons

Makefile

@@ -17,7 +17,7 @@ VCVARS_64 = C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\V
 all: mice86 dist
 
 mice86:
-	@subst $(BUILD_DRIVE) .
+	-@subst $(BUILD_DRIVE) .
 	@cd /D $(BUILD_DRIVE) \
 	& "$(VCVARS_32)" \
 	& meson setup --cross cross-32.ini $(BUILD_DRIVE)\$(BUILD_DIR_32) \
@@ -25,7 +25,7 @@ mice86:
 	@subst $(BUILD_DRIVE) /D
 
 mice64:
-	@subst $(BUILD_DRIVE) .
+	-@subst $(BUILD_DRIVE) .
 	@cd $(BUILD_DRIVE) \
 	& "$(VCVARS_64)" \
 	& meson setup --cross cross-64.ini $(BUILD_DRIVE)\$(BUILD_DIR_64) \

assets/Makefile

@@ -0,0 +1,5 @@
+CONVERT=cmd /c "C:\Windows\Sysnative\wsl.exe convert"
+assets:
+	$(CONVERT) -define icon:auto-resize mice.png mice.ico
+	$(CONVERT) -define icon:auto-resize micepatch.png micepatch.ico
+	$(CONVERT) -define icon:auto-resize micekeychip.png micekeychip.ico

assets/meson.build

@@ -0,0 +1,3 @@
+mice_ico = files('mice.ico')
+micepatch_ico = files('micepatch.ico')
+micekeychip_ico = files('micekeychip.ico')

meson.build

@@ -11,4 +11,5 @@ add_project_arguments(
     language: 'c',
 )
 
+subdir('assets')
 subdir('src')

meson.py

@@ -1,7 +1,8 @@
+import sys
 import os
 from mesonbuild import mesonmain
 
 # https://bugs.python.org/issue36112
 os.path.realpath = lambda path: path
 
-mesonmain.main()
+sys.exit(mesonmain.main())

src/micetools/launcher/meson.build

@@ -1,3 +1,4 @@
+rc = import('windows').compile_resources('mice.rc', depend_files: mice_ico)
 executable(
     'mice',
     win_subsystem: 'console',
@@ -5,6 +6,7 @@ executable(
         'locate.c',
         'exe.c',
         'main.c',
+        rc,
     ],
     link_with: [
         mice_lib,

src/micetools/launcher/mice.rc

@@ -0,0 +1,3 @@
+#include <winuser.h>
+
+0 ICON "../../assets/mice.ico"

src/micetools/micekeychip/meson.build

@@ -10,6 +10,7 @@ else
     dependencies += meson.get_compiler('c').find_library('ws2_32')
 endif
 
+rc = import('windows').compile_resources('micekeychip.rc', depend_files: micekeychip_ico)
 executable(
     'micekeychip',
     win_subsystem: 'console',
@@ -22,6 +23,7 @@ executable(
         'callbacks/misc.c',
         'callbacks/tracedata.c',
         'callbacks/storage.c',
+        rc,
     ],
     link_with: link_with,
     dependencies: dependencies,

src/micetools/micekeychip/micekeychip.rc

@@ -0,0 +1,3 @@
+#include <winuser.h>
+
+0 ICON "../../assets/micekeychip.ico"

src/micetools/micepatch/meson.build

@@ -1,8 +1,10 @@
-executable(
+rc = import('windows').compile_resources('micepatch.rc', depend_files: micepatch_ico)
+micepatch = executable(
     'micepatch',
     win_subsystem: 'console',
     sources: [
         'main.c',
+        rc,
     ],
     link_with: [
         mice_lib,

src/micetools/micepatch/micepatch.rc

@@ -0,0 +1,3 @@
+#include <winuser.h>
+
+0 ICON "../../assets/micepatch.ico"