From 8423f06d38b4850304bed5d91f8edfd72f562d5e Mon Sep 17 00:00:00 2001
From: InvisibleUp <invisibleup@outlook.com>
Date: Sat, 1 Apr 2023 16:45:26 -0700
Subject: [PATCH] Add Win32 manifest, rsrc dependency list

manifest needed for 1:1 pixel sizing on high DPI displays
---
 meson.build             |   9 ++++++++-
 rsrc/WIN32/app.manifest |  36 ++++++++++++++++++++++++++++++++++++
 rsrc/WIN32/main.aps     | Bin 17728 -> 0 bytes
 rsrc/WIN32/main.rc      |   9 +++++++--
 4 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 rsrc/WIN32/app.manifest
 delete mode 100644 rsrc/WIN32/main.aps

diff --git a/meson.build b/meson.build
index c5e6fb4..5190e1e 100644
--- a/meson.build
+++ b/meson.build
@@ -60,11 +60,18 @@ configure_file(
 lSDL2 = dependency('SDL2', static: true)
 
 # Windows resources
-# todo: gate this off if not on Windows
 if target_machine.system() == 'windows'
 	windows = import('windows')
 	WIN_RSRC = windows.compile_resources(
 		'rsrc/WIN32/main.rc',
+		depend_files: [
+			'rsrc/WIN32/app.manifest',
+			'rsrc/WIN32/ICONAPPW.ico',
+			'rsrc/WIN32/ICONDSKW.ico',
+			'rsrc/WIN32/ICONROMW.ico',
+			'rsrc/SONYDRV.bin',
+			'rsrc/SONYICO.bin',
+		]
 	)
 else
 	WIN_RSRC = []
diff --git a/rsrc/WIN32/app.manifest b/rsrc/WIN32/app.manifest
new file mode 100644
index 0000000..425f25f
--- /dev/null
+++ b/rsrc/WIN32/app.manifest
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Supports Windows Vista / Server 2008 -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!-- Supports Windows 7 / Server 2008 R2 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Supports Windows 8 / Server 2012 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Supports Windows 8.1 / Server 2012 R2 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Supports Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
+    </dependentAssembly>
+  </dependency>
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">system</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file
diff --git a/rsrc/WIN32/main.aps b/rsrc/WIN32/main.aps
deleted file mode 100644
index dfa0f93d69c5839faa4f57aff628bb0f8699e6cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17728
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
OgI)`mew=GsWBv!aUi%aP

diff --git a/rsrc/WIN32/main.rc b/rsrc/WIN32/main.rc
index 0f68cab..d23cde7 100644
--- a/rsrc/WIN32/main.rc
+++ b/rsrc/WIN32/main.rc
@@ -1,4 +1,9 @@
-//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#include "winresrc.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+// Application manifest
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "app.manifest"
 
 // Icons
 ICO_APP 	ICON DISCARDABLE	"ICONAPPW.ico"
@@ -24,7 +29,7 @@ BEGIN
             VALUE "FileDescription",  "A 68k Macintosh emulator\0"
             VALUE "FileVersion",      "v0.37.0\0"
             VALUE "InternalName",     "microvmac\0"
-            VALUE "LegalCopyright",   "©1996-2020 various contributors. Licensed under the GPL v2.\0"
+            VALUE "LegalCopyright",   "(c)1996-2023 various contributors. Licensed under the GPL v2.\0"
             VALUE "OriginalFilename", "microvmac.exe\0"
             VALUE "ProductName",      "micro vMac\0"
             VALUE "ProductVersion",   "v0.37.0\0"