Merge remote-tracking branch 'origin/dev'

.gitmodules

@@ -38,3 +38,6 @@
 [submodule "core/deps/rcheevos"]
 	path = core/deps/rcheevos
 	url = https://github.com/RetroAchievements/rcheevos.git
+[submodule "core/deps/googletest"]
+	path = core/deps/googletest
+	url = https://github.com/google/googletest.git

CMakeLists.txt

@@ -101,17 +101,21 @@ if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
 		OUTPUT_VARIABLE GIT_HASH
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
-	if(WINDOWS_STORE)
-		string(REGEX REPLACE "[Vv]" "" MS_VERSION ${GIT_VERSION})
-		string(REPLACE "-" "." MS_VERSION ${MS_VERSION})
-		string(REGEX REPLACE "\.g[0-9a-f]+" "" MS_VERSION ${MS_VERSION})
-		string(REGEX MATCHALL "[0-9]+" VERSION_PARTS ${MS_VERSION})
-		list(LENGTH VERSION_PARTS VERSION_PARTS_LENGTH)
-		if(VERSION_PARTS_LENGTH EQUAL 2)
-			string(APPEND MS_VERSION ".0.0")
-		elseif(VERSION_PARTS_LENGTH EQUAL 3)
-			string(APPEND MS_VERSION ".0")
-		endif()
+else()
+	set(GIT_VERSION "v0.0.0-0-g000000000")
+	set(GIT_HASH "000000000")
+endif()
+
+if(WINDOWS_STORE)
+	string(REGEX REPLACE "[Vv]" "" MS_VERSION ${GIT_VERSION})
+	string(REPLACE "-" "." MS_VERSION ${MS_VERSION})
+	string(REGEX REPLACE "\.g[0-9a-f]+" "" MS_VERSION ${MS_VERSION})
+	string(REGEX MATCHALL "[0-9]+" VERSION_PARTS ${MS_VERSION})
+	list(LENGTH VERSION_PARTS VERSION_PARTS_LENGTH)
+	if(VERSION_PARTS_LENGTH EQUAL 2)
+		string(APPEND MS_VERSION ".0.0")
+	elseif(VERSION_PARTS_LENGTH EQUAL 3)
+		string(APPEND MS_VERSION ".0")
 	endif()
 endif()
 
@@ -188,7 +192,11 @@ elseif(ANDROID)
 	target_compile_options(${PROJECT_NAME} PRIVATE -fno-stack-protector)
 	set(CMAKE_ANDROID_STL_TYPE "c++_static")
 elseif(WIN32)
-	add_executable(${PROJECT_NAME} WIN32 core/emulator.cpp)
+	if(BUILD_TESTING)
+		add_executable(${PROJECT_NAME} core/emulator.cpp)
+	else()
+		add_executable(${PROJECT_NAME} WIN32 core/emulator.cpp)
+	endif()
 	if(CMAKE_GENERATOR MATCHES "Visual Studio")
 		if(NOT CMAKE_VS_GLOBALS MATCHES "(^|;)UseMultiToolTask=")
 			list(APPEND CMAKE_VS_GLOBALS UseMultiToolTask=true)
@@ -425,7 +433,7 @@ if(NOT LIBRETRO)
 		endif()
 
 		# SDL2::SDL2main may or may not be available. It is e.g. required by Windows GUI applications
-		if(TARGET SDL2::SDL2main)
+		if(TARGET SDL2::SDL2main AND NOT BUILD_TESTING)
 			# It has an implicit dependency on SDL2 functions, so it MUST be added before SDL2::SDL2 (or SDL2::SDL2-static)
 			target_link_libraries(${PROJECT_NAME} PRIVATE SDL2::SDL2main)
 		endif()
@@ -1804,11 +1812,13 @@ if(NOT LIBRETRO)
 					core/deps/SDL/src/main/winrt/SDL2-WinRTResources.rc)
 			target_sources(${PROJECT_NAME} PRIVATE
 				${ResourceFiles}
-				core/deps/SDL/src/main/winrt/SDL_winrt_main_NonXAML.cpp
 				shell/uwp/http_client.cpp)
+			if(NOT BUILD_TESTING)
+				target_sources(${PROJECT_NAME} PRIVATE core/deps/SDL/src/main/winrt/SDL_winrt_main_NonXAML.cpp)
+			endif()
 			set_target_properties(${PROJECT_NAME} PROPERTIES RESOURCE "${ResourceFiles}")
 		else()
-			if("x86" IN_LIST ARCHITECTURE OR "x86_64" IN_LIST ARCHITECTURE)
+			if(NOT BUILD_TESTING AND ("x86" IN_LIST ARCHITECTURE OR "x86_64" IN_LIST ARCHITECTURE))
 				target_include_directories(${PROJECT_NAME} PRIVATE core/deps/Spout/SPOUTSDK/SpoutGL)
 				target_include_directories(${PROJECT_NAME} PRIVATE core/deps/Spout/SPOUTSDK/SpoutDirectX/SpoutDX)
 				SET(SPOUT_BUILD_CMT OFF CACHE BOOL "For Visual Studio - build /MT to link runtime libraries" FORCE)
@@ -1827,9 +1837,13 @@ if(NOT LIBRETRO)
 endif()
 
 if(BUILD_TESTING)
-	target_sources(${PROJECT_NAME} PRIVATE
-			core/deps/gtest/src/gtest-all.cc
-			core/deps/gtest/src/gtest_main.cc)
+	option(BUILD_GMOCK "Builds the googlemock subproject" OFF)
+	option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF)
+	if(WIN32)
+		set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+	endif()
+	add_subdirectory(core/deps/googletest EXCLUDE_FROM_ALL)
+	target_link_libraries(${PROJECT_NAME} PRIVATE gtest_main)
 
 	target_sources(${PROJECT_NAME} PRIVATE
 			tests/src/CheatManagerTest.cpp

core/audio/audiobackend_oboe.cpp

@@ -91,6 +91,7 @@ class OboeBackend : AudioBackend
 				->setFormat(oboe::AudioFormat::I16)
 				->setChannelCount(oboe::ChannelCount::Stereo)
 				->setSampleRate(44100)
+				->setSampleRateConversionQuality(oboe::SampleRateConversionQuality::High)
 				->setFramesPerCallback(SAMPLE_COUNT)
 				->setDataCallback(&audioCallback)
 				->setErrorCallback(&errorCallback)