From 112ad2d5d0f1b90e0920ceb9d06965e01fe28372 Mon Sep 17 00:00:00 2001
From: elasota <1137273+elasota@users.noreply.github.com>
Date: Tue, 6 Aug 2024 23:19:13 -0400
Subject: [PATCH] Fix missing prop sheets and references

---
 ConvertColorCursors/ConvertColorCursors.vcxproj | 7 +++++++
 MakeTimestamp/MakeTimestamp.cpp                 | 5 +++--
 MakeTimestamp/MakeTimestamp.vcxproj             | 7 +++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ConvertColorCursors/ConvertColorCursors.vcxproj b/ConvertColorCursors/ConvertColorCursors.vcxproj
index 0b44cfb..986fc4d 100644
--- a/ConvertColorCursors/ConvertColorCursors.vcxproj
+++ b/ConvertColorCursors/ConvertColorCursors.vcxproj
@@ -64,6 +64,7 @@
     <Import Project="..\stb.props" />
     <Import Project="..\Debug.props" />
     <Import Project="..\AerofoilPortable.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -73,6 +74,7 @@
     <Import Project="..\stb.props" />
     <Import Project="..\Debug.props" />
     <Import Project="..\AerofoilPortable.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -82,6 +84,7 @@
     <Import Project="..\stb.props" />
     <Import Project="..\Release.props" />
     <Import Project="..\AerofoilPortable.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -91,6 +94,7 @@
     <Import Project="..\stb.props" />
     <Import Project="..\Release.props" />
     <Import Project="..\AerofoilPortable.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -142,6 +146,9 @@
     <ProjectReference Include="..\PortabilityLayer\PortabilityLayer.vcxproj">
       <Project>{6ec62b0f-9353-40a4-a510-3788f1368b33}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\WindowsUnicodeToolShim\WindowsUnicodeToolShim.vcxproj">
+      <Project>{15009625-1120-405e-8bba-69a16cd6713d}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\AerofoilPortable\GpAllocator_C.cpp" />
diff --git a/MakeTimestamp/MakeTimestamp.cpp b/MakeTimestamp/MakeTimestamp.cpp
index 1e82169..40efd89 100644
--- a/MakeTimestamp/MakeTimestamp.cpp
+++ b/MakeTimestamp/MakeTimestamp.cpp
@@ -9,9 +9,10 @@
 
 #include <cstdio>
 
+#include "WindowsUnicodeToolShim.h"
 #include "CombinedTimestamp.h"
 
-int main(int argc, const char **argv)
+int toolMain(int argc, const char **argv)
 {
 	if (argc != 2)
 	{
@@ -84,7 +85,7 @@ int main(int argc, const char **argv)
 
 	memset(ts.m_padding, 0, sizeof(ts.m_padding));
 
-	FILE *f = fopen(argv[1], "wb");
+	FILE *f = fopen_utf8(argv[1], "wb");
 	if (!f)
 	{
 		perror("Error opening output file");
diff --git a/MakeTimestamp/MakeTimestamp.vcxproj b/MakeTimestamp/MakeTimestamp.vcxproj
index d1dbe22..cc4a9b3 100644
--- a/MakeTimestamp/MakeTimestamp.vcxproj
+++ b/MakeTimestamp/MakeTimestamp.vcxproj
@@ -59,18 +59,22 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -125,6 +129,9 @@
     <ProjectReference Include="..\PortabilityLayer\PortabilityLayer.vcxproj">
       <Project>{6ec62b0f-9353-40a4-a510-3788f1368b33}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\WindowsUnicodeToolShim\WindowsUnicodeToolShim.vcxproj">
+      <Project>{15009625-1120-405e-8bba-69a16cd6713d}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">