Update GTest & rename Quake1 -> Quake1R

- To emphasize that it's the remake in question
visuve · Jan 4, 2024 · e1a4245 · e1a4245
1 parent 1f7b032
commit e1a4245
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,7 +44,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 4)
 endif()
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	add_subdirectory("Quake1")
+	add_subdirectory("Quake1R")
 	add_subdirectory("Hitman2016")
 	add_subdirectory("Metro2033Redux")
 	add_subdirectory("Doom2016")

diff --git a/GoogleTest.cmake b/GoogleTest.cmake
@@ -1,5 +1,5 @@
 include(FetchContent)
 
-FetchContent_Declare(googletest URL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.zip)
+FetchContent_Declare(googletest URL https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip)
 
 FetchContent_MakeAvailable(googletest)
diff --git a/HackLibTests/HackLibTests.cpp b/HackLibTests/HackLibTests.cpp
@@ -47,10 +47,13 @@ int wmain(int argc, wchar_t** argv)
 			return ERROR_BAD_ARGUMENTS;
 	}
 
+	testing::InitGoogleTest(&argc, argv);
+
 #if defined(_DEBUG)
 	testing::UnitTest::GetInstance()->listeners().Append(new MemoryLeakListener());
 #endif
 
-	testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
+	int result = testing::UnitTest::GetInstance()->Run();
+
+	return result;
 }
diff --git a/Quake1/CMakeLists.txt → Quake1R/CMakeLists.txt b/Quake1/CMakeLists.txt → Quake1R/CMakeLists.txt
diff --git a/Quake1/Quake1.cpp → Quake1R/Quake1.cpp b/Quake1/Quake1.cpp → Quake1R/Quake1.cpp
diff --git a/Quake1/Quake1Cheats.asm → Quake1R/Quake1Cheats.asm b/Quake1/Quake1Cheats.asm → Quake1R/Quake1Cheats.asm