From b361d5ede18e887986951c21ea2c64b8573760c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Wed, 17 May 2023 21:21:26 -0500
Subject: [PATCH] Use UTF-8 for MSVC and enable visual styles for Windows
 (#2888)

* Add proper manifest for Windows

* MSVC: Use UTF-8 encoding compile option
---
 CMakeLists.txt               |  1 +
 soh/CMakeLists.txt           |  2 ++
 soh/Resource.rc              |  7 +++++++
 soh/SHIPOFHARKINIAN.manifest | 31 +++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 soh/SHIPOFHARKINIAN.manifest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ba457735..698810a73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
 add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)
+add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/utf-8>)
 
 if (CMAKE_SYSTEM_NAME MATCHES "Windows|Linux")
     if(NOT DEFINED BUILD_CROWD_CONTROL)
diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
index 5aaeb6fd4..23e657f0d 100644
--- a/soh/CMakeLists.txt
+++ b/soh/CMakeLists.txt
@@ -500,6 +500,7 @@ if(MSVC)
                 /INCREMENTAL:NO;
                 /FORCE:MULTIPLE
             >
+            /MANIFEST:NO;
             /DEBUG;
             /SUBSYSTEM:WINDOWS
         )
@@ -514,6 +515,7 @@ if(MSVC)
                 /INCREMENTAL:NO;
                 /FORCE:MULTIPLE
             >
+            /MANIFEST:NO;
             /DEBUG;
             /SUBSYSTEM:WINDOWS
         )
diff --git a/soh/Resource.rc b/soh/Resource.rc
index ad27c5471..7d9f356d0 100644
--- a/soh/Resource.rc
+++ b/soh/Resource.rc
@@ -91,6 +91,13 @@ END
 // remains consistent on all systems.
 IDI_ICON1               ICON                    "SHIPOFHARKINIAN.ico"
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// RT_MANIFEST
+//
+
+1                       RT_MANIFEST             "SHIPOFHARKINIAN.manifest"
+
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/soh/SHIPOFHARKINIAN.manifest b/soh/SHIPOFHARKINIAN.manifest
new file mode 100644
index 000000000..80d9f6036
--- /dev/null
+++ b/soh/SHIPOFHARKINIAN.manifest
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0"
+        publicKeyToken="6595b64144ccf1df"
+        language="*"
+        processorArchitecture="*" />
+      </dependentAssembly>
+  </dependency>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+</assembly>