Merge branch 'master' into windows_build_fix

2024-05-27 12:17:07 +03:00
parent af32720dbd 8875a2d4ee
commit 114292c96c
17 changed files with 514 additions and 158 deletions
--- a/openVulkanoCpp/AR/ArRecorder.cpp
+++ b/openVulkanoCpp/AR/ArRecorder.cpp
@@ -16,10 +16,10 @@
 #include "Image/YuvUtils.hpp"
 #include <fstream>
 #include <iostream>
-//#if __has_include("turbojpeg.h")
+#if __has_include("turbojpeg.h")
 #include <turbojpeg.h>
 #define TURBO_JPEG
-//#endif
+#endif

 namespace OpenVulkano::AR
 {