Merge 56d3712 into 68d181d

sakura-editor · Jan 28, 2022 · 5d86f04 · 5d86f04
2 parents 68d181d + 56d3712
commit 5d86f04
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/tests/googletest b/tests/googletest
diff --git 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
@@ -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

diff --git 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"
 
 /*!