diff --git a/Makefile b/Makefile index d8bc160..46b066a 100644 --- a/Makefile +++ b/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) \ diff --git a/assets/Makefile b/assets/Makefile new file mode 100644 index 0000000..e8c2854 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/assets/meson.build b/assets/meson.build new file mode 100644 index 0000000..f5db824 --- /dev/null +++ b/assets/meson.build @@ -0,0 +1,3 @@ +mice_ico = files('mice.ico') +micepatch_ico = files('micepatch.ico') +micekeychip_ico = files('micekeychip.ico') diff --git a/assets/mice.ico b/assets/mice.ico new file mode 100644 index 0000000..eb2cb2c Binary files /dev/null and b/assets/mice.ico differ diff --git a/assets/mice.png b/assets/mice.png new file mode 100644 index 0000000..c71e50e Binary files /dev/null and b/assets/mice.png differ diff --git a/assets/micekeychip.ico b/assets/micekeychip.ico new file mode 100644 index 0000000..39141a1 Binary files /dev/null and b/assets/micekeychip.ico differ diff --git a/assets/micekeychip.png b/assets/micekeychip.png new file mode 100644 index 0000000..7a1f387 Binary files /dev/null and b/assets/micekeychip.png differ diff --git a/assets/micepatch.ico b/assets/micepatch.ico new file mode 100644 index 0000000..bfcae40 Binary files /dev/null and b/assets/micepatch.ico differ diff --git a/assets/micepatch.png b/assets/micepatch.png new file mode 100644 index 0000000..36312b0 Binary files /dev/null and b/assets/micepatch.png differ diff --git a/assets/micetools.png b/assets/micetools.png new file mode 100644 index 0000000..052505d Binary files /dev/null and b/assets/micetools.png differ diff --git a/meson.build b/meson.build index e997b50..6d81df6 100644 --- a/meson.build +++ b/meson.build @@ -11,4 +11,5 @@ add_project_arguments( language: 'c', ) +subdir('assets') subdir('src') diff --git a/meson.py b/meson.py index 5125c0a..ebb52d3 100644 --- a/meson.py +++ b/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()) diff --git a/src/micetools/launcher/meson.build b/src/micetools/launcher/meson.build index 55225b6..2cad1a7 100644 --- a/src/micetools/launcher/meson.build +++ b/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, diff --git a/src/micetools/launcher/mice.rc b/src/micetools/launcher/mice.rc new file mode 100644 index 0000000..3851c6f --- /dev/null +++ b/src/micetools/launcher/mice.rc @@ -0,0 +1,3 @@ +#include + +0 ICON "../../assets/mice.ico" diff --git a/src/micetools/micekeychip/meson.build b/src/micetools/micekeychip/meson.build index 880d6ef..96122f4 100644 --- a/src/micetools/micekeychip/meson.build +++ b/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, diff --git a/src/micetools/micekeychip/micekeychip.rc b/src/micetools/micekeychip/micekeychip.rc new file mode 100644 index 0000000..92a9204 --- /dev/null +++ b/src/micetools/micekeychip/micekeychip.rc @@ -0,0 +1,3 @@ +#include + +0 ICON "../../assets/micekeychip.ico" diff --git a/src/micetools/micepatch/meson.build b/src/micetools/micepatch/meson.build index bee3926..f10a6f8 100644 --- a/src/micetools/micepatch/meson.build +++ b/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, diff --git a/src/micetools/micepatch/micepatch.rc b/src/micetools/micepatch/micepatch.rc new file mode 100644 index 0000000..9313b53 --- /dev/null +++ b/src/micetools/micepatch/micepatch.rc @@ -0,0 +1,3 @@ +#include + +0 ICON "../../assets/micepatch.ico"