From dfd5b4e77562b34273386f28648b8083cb040e88 Mon Sep 17 00:00:00 2001
From: Micha Janiszewski <janisozaur@gmail.com>
Date: Sun, 8 May 2022 13:20:26 -0700
Subject: [PATCH] Update MSVC project to use correct Google Test library

---
 openrct2.proj            | 15 ---------------
 test/tests/tests.vcxproj |  7 ++++---
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/openrct2.proj b/openrct2.proj
index 80ac265f3d..5aac1fb3a9 100644
--- a/openrct2.proj
+++ b/openrct2.proj
@@ -43,9 +43,6 @@
     <LibsSha1 Condition="'$(Platform)'=='x64'">6eb97a49ad30442fe6d08799a0561d7cf0c95d40</LibsSha1>
     <LibsUrl Condition="'$(Platform)'=='ARM64'">https://github.com/OpenRCT2/Dependencies/releases/download/v32/openrct2-libs-v32-arm64-windows-static.zip</LibsUrl>
     <LibsSha1 Condition="'$(Platform)'=='ARM64'">fa5f067fcfb5e76c4d4fb6f2211b422cbbe25f26</LibsSha1>
-    <GtestVersion>2fe3bd994b3189899d93f1d5a881e725e046fdc2</GtestVersion>
-    <GtestUrl>https://github.com/google/googletest/archive/$(GtestVersion).zip</GtestUrl>
-    <GtestSha1>058b9df80244c03f1633cb06e9f70471a29ebb8e</GtestSha1>
     <TitleSequencesUrl>https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/title-sequences.zip</TitleSequencesUrl>
     <TitleSequencesSha1>4ab0065e5a4d9f9c77d94718bbdfcfcd5a389da0</TitleSequencesSha1>
     <ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.2.7/objects.zip</ObjectsUrl>
@@ -65,18 +62,6 @@
                         Sha1="$(LibsSha1)"
                         CheckFile="$(DependenciesCheckFile)"
                         OutputDirectory="$(RootDir)lib\$(Platform)" />
-
-    <!-- googletest -->
-    <DownloadDependency Name="googletest"
-                        Url="$(GtestUrl)"
-                        Sha1="$(GtestSha1)"
-                        CheckFile="$(DependenciesCheckFile)"
-                        OutputDirectory="$(RootDir)lib" />
-    <PropertyGroup>
-      <GtestSrc>$(RootDir)lib\googletest-$(GtestVersion)</GtestSrc>
-      <GtestDst>$(RootDir)lib\googletest</GtestDst>
-    </PropertyGroup>
-    <Exec Command="cmd /c &quot;if exist &quot;$(GtestSrc)&quot; ( rmdir /S /Q &quot;$(GtestDst)&quot; 2> nul &amp; move &quot;$(GtestSrc)&quot; &quot;$(GtestDst)&quot; )&quot;" />
   </Target>
 
   <Target Name="Clean">
diff --git a/test/tests/tests.vcxproj b/test/tests/tests.vcxproj
index 3fe3fd1406..199bb4a234 100644
--- a/test/tests/tests.vcxproj
+++ b/test/tests/tests.vcxproj
@@ -2,7 +2,6 @@
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SolutionDir Condition="'$(SolutionDir)'==''">..\..\</SolutionDir>
-    <GtestDir Condition="'$(GtestDir)'==''">$(SolutionDir)lib\googletest\googletest</GtestDir>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -41,8 +40,9 @@
   <Import Project="..\..\openrct2.common.props" />
   <PropertyGroup>
     <OutDir>$(SolutionDir)bin\</OutDir>
-    <IncludePath>$(GtestDir);$(GtestDir)\include;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)bin;$(LibraryPath)</LibraryPath>
+    <LibraryPath Condition="'$(Configuration)'=='Debug'">$(SolutionDir)lib\$(Platform)\debug\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath Condition="'$(Configuration)'!='Debug'">$(SolutionDir)lib\$(Platform)\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -50,6 +50,8 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>libopenrct2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)'=='Debug'">gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)'!='Debug'">gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
     </Link>
     <PostBuildEvent>
@@ -83,7 +85,6 @@
     <ClCompile Include="RideRatings.cpp" />
     <ClCompile Include="S6ImportExportTests.cpp" />
     <ClCompile Include="sawyercoding_test.cpp" />
-    <ClCompile Include="$(GtestDir)\src\gtest-all.cc" />
     <ClCompile Include="TestData.cpp" />
     <ClCompile Include="tests.cpp" />
     <ClCompile Include="StringTest.cpp" />