From 2a920310e5cafbafc3ee29712cadb37196b18529 Mon Sep 17 00:00:00 2001
From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com>
Date: Wed, 26 Jan 2022 12:07:41 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=AF=E3=83=AB=E3=83=BC=E3=83=89=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=EF=BC=88=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E3=82=A8=E3=83=A9=E3=83=BC=E5=AF=BE=E7=AD=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/unittests/test-zoom.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unittests/test-zoom.cpp b/tests/unittests/test-zoom.cpp
index 6305c058db..289ea58f66 100644
--- a/tests/unittests/test-zoom.cpp
+++ b/tests/unittests/test-zoom.cpp
@@ -23,6 +23,7 @@
 		   distribution.
 */
 #include <gtest/gtest.h>
+#include <algorithm>
 #include "util/zoom.h"
 
 /*!

From b9cb771c8ee531b6fae14269360bb96b7d701145 Mon Sep 17 00:00:00 2001
From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com>
Date: Thu, 27 Jan 2022 15:29:28 +0900
Subject: [PATCH 2/3] =?UTF-8?q?GoogleTest=E3=81=8C`DEBUG=5FPOSTFIX`?=
 =?UTF-8?q?=E3=82=92=E8=A8=AD=E5=AE=9A=E3=81=97=E3=81=AA=E3=81=8F=E3=81=AA?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=81=93=E3=81=A8=E3=81=AB=E3=82=88=E3=82=8B?=
 =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=E5=90=8D=E3=81=AE?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=AB=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/googletest.targets | 6 ++----
 tests/unittests/Makefile | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/googletest.targets b/tests/googletest.targets
index 3c6efdf7b8..91c2fae8d0 100644
--- a/tests/googletest.targets
+++ b/tests/googletest.targets
@@ -7,10 +7,8 @@
     <GoogleTestLibInstallDir Condition="'$(Platform)' == 'Win32'">$(GoogleTestInstallDir)lib</GoogleTestLibInstallDir>
     <GoogleTestLibInstallDir Condition="'$(Platform)' == 'x64'">$(GoogleTestInstallDir)lib64</GoogleTestLibInstallDir>
     <LibraryPath>$(GoogleTestLibInstallDir);$(LibraryPath)</LibraryPath>
-    <NameSuffix Condition="'$(Configuration)' == 'Debug'">d</NameSuffix>
-    <NameSuffix Condition="'$(Configuration)' == 'Release'"></NameSuffix>
-    <GTestLibName>gtest$(NameSuffix).lib</GTestLibName>
-    <GTestMainLibName>gtest_main$(NameSuffix).lib</GTestMainLibName>
+    <GTestLibName>gtest.lib</GTestLibName>
+    <GTestMainLibName>gtest_main.lib</GTestMainLibName>
     <GTestLibPath>$(GoogleTestLibInstallDir)\$(GTestLibName)</GTestLibPath>
     <GTestMainLibPath>$(GoogleTestLibInstallDir)\$(GTestMainLibName)</GTestMainLibPath>
   </PropertyGroup>
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index b16eb0ad16..59c3692614 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -81,8 +81,6 @@ ifeq (,$(findstring -D_DEBUG,$(DEFINES)))
 ifeq (,$(findstring -DNDEBUG,$(DEFINES)))
 DEFINES += -DNDEBUG
 endif
-else
-LIB_SUFFIX = d
 endif
 
 CFLAGS= \
@@ -120,8 +118,8 @@ LIBS= \
  -lgdi32 \
  -lcomdlg32 \
  -L$(GOOGLETEST_INSTALL_DIR)/lib \
- -lgtest$(or $(LIB_SUFFIX),) \
- -lgtest_main$(or $(LIB_SUFFIX),) \
+ -lgtest \
+ -lgtest_main \
  $(MYLIBS)
 
 exe= $(or $(OUTDIR),.)/tests1.exe

From 56d37120d01ed7b15059c089e990ecaea6f994d1 Mon Sep 17 00:00:00 2001
From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com>
Date: Thu, 27 Jan 2022 15:31:17 +0900
Subject: [PATCH 3/3] =?UTF-8?q?GoogleTest=E3=82=92=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/googletest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/googletest b/tests/googletest
index 3cf8f514d8..0b7798b2fb 160000
--- a/tests/googletest
+++ b/tests/googletest
@@ -1 +1 @@
-Subproject commit 3cf8f514d859d65b7202e51c662a03a92887b8e2
+Subproject commit 0b7798b2fba340969a0cf83698e5c0a2e25b7dbc