Merge branch 'master' into features/string-wrapper

2024-10-21 11:59:16 +02:00
parent 11ca0e93d7 03d8a65e96
commit 5a4041786a
12 changed files with 419 additions and 11 deletions
--- a/openVulkanoCpp/Host/WebResourceLoader.cpp
+++ b/openVulkanoCpp/Host/WebResourceLoader.cpp
@@ -21,6 +21,7 @@

 namespace OpenVulkano
 {
+#ifdef HAS_CURL
 	namespace
 	{
 		size_t CurlDownloader(void* contents, size_t size, size_t memBlockCount, void* userData)
@@ -31,10 +32,11 @@ namespace OpenVulkano
 			return totalSize;
 		}
 	}
+#endif

 	bool WebResourceLoader::IsUrl(const std::string& str)
 	{
-		return str.find("http://") == 0 || str.find("https://") == 0 || str.find("ftp://") == 0;
+		return Utils::StartsWith(str, "http://") || Utils::StartsWith(str, "https://") || Utils::StartsWith(str, "ftp://");
 	}

 	WebResourceLoader::WebResourceLoader()