Google tests framework for UnitTests

Apps/UnitTests/Android/app/src/main/cpp/JNI.cpp

@@ -6,14 +6,18 @@
 #include <atomic>
 #include <Shared/Tests.h>
 
-static int pfd[2];
-static int fd_saved[2];
-void *thread_func(void*)
+namespace
+{
+    int pfd[2];
+    int fd_saved[2];
+}
+void* thread_func(void*)
 {
     ssize_t rdsz;
     char buf[128];
-    while((rdsz = read(pfd[0], buf, sizeof buf - 1)) > 0) {
-        if(buf[rdsz - 1] == '\n') --rdsz;
+    while ((rdsz = read(pfd[0], buf, sizeof buf - 1)) > 0)
+    {
+        if (buf[rdsz - 1] == '\n') --rdsz;
         buf[rdsz] = 0;
         __android_log_write(ANDROID_LOG_DEBUG, "UnitTests", buf);
     }
@@ -35,7 +39,7 @@ void start_logger()
     dup2(pfd[1], 2);
 
     // spawn the logging thread
-    if(pthread_create(&thr, 0, thread_func, 0) == -1)
+    if (pthread_create(&thr, 0, thread_func, 0) == -1)
     {
         return;
     }

CMakeLists.txt

@@ -66,8 +66,13 @@ endif()
 
 
 if(NOT WINDOWS_STORE)
-    # For Windows: Prevent overriding the parent project's compiler/linker settings
-    set(gtest_force_shared_crt OFF CACHE BOOL "" FORCE)
+	if(WIN32)
+		# For Windows: Prevent overriding the parent project's compiler/linker settings
+		# Default build type for my test projects are /MDd (MultiThreaded DLL) but GTests default to /MTd (MultiTreaded)
+		# see https://github.com/google/googletest/blob/main/googletest/README.md
+		# "Enabling this option will make gtest link the runtimes dynamically too, and match the project in which it is included."
+		set(gtest_force_shared_crt OFF CACHE BOOL "" FORCE)
+	endif()
     set(CONTENT_TO_FETCH ${CONTENT_TO_FETCH} googletest)
 endif()
 

Core/Graphics/Source/DeviceImpl.h

@@ -100,7 +100,7 @@ namespace Babylon::Graphics
 
         static const bool s_bgfxFlipAfterRender;
         static const bgfx::RendererType::Enum s_bgfxRenderType;
-        static void ConfigureBgfxPlatformData(bgfx::PlatformData& platformData, WindowT window);
+        static void ConfigureBgfxPlatformData(bgfx::PlatformData& pd, WindowT window);
         static void ConfigureBgfxRenderType(bgfx::PlatformData& pd, bgfx::RendererType::Enum& renderType);
         static float GetDevicePixelRatio(WindowT window);