fix a few compile errors, also fix a if-statement assignment bug, add std::filesystem copy options for proper recursive copy and overwriting files

Author: AnastaZIuk

include/nbl/system/CAPKResourcesArchive.h

@@ -38,9 +38,9 @@ class CAPKResourcesArchive : public IFileArchive
 		AAsset_close(asset);
 		return fileView;
 	}
-	core::vector<std::string> listAssets(const char* asset_path) override
+	core::vector<system::path> listAssets(const char* asset_path) override
 	{
-		core::vector<std::string> result;
+		core::vector<system::path> result;
 
 		auto context_object = activity->clazz;
 		auto getAssets_method = env->GetMethodID(env->GetObjectClass(context_object), "getAssets", "()Landroid/content/res/AssetManager;");
@@ -63,14 +63,11 @@ class CAPKResourcesArchive : public IFileArchive
 
 			if (filename != nullptr)
 			{
-				if (std::string(asset_path) = "")
-				{
-					result.push_back(filename);
-				}
+				if (std::string(asset_path) == "")
+					result.push_back(std::string(filename));
 				else
-				{
 					result.push_back((std::filesystem::path(asset_path) / filename).generic_string());
-				}
+				
 				env->ReleaseStringUTFChars(jstr, filename);
 			}
 

include/nbl/system/ISystem.h

@@ -477,8 +477,9 @@ class ISystem : public core::IReferenceCounted
             }
             else
             {
+				const auto copyOptions = std::filesystem::copy_options::recursive | std::filesystem::copy_options::overwrite_existing;
                 std::error_code error;
-                std::filesystem::copy(from, to, error);
+                std::filesystem::copy(from, to, copyOptions, error);
                 return static_cast<bool>(error);
             }
         }

include/nbl/ui/CWindowManagerAndroid.h

@@ -9,6 +9,8 @@
 
 #include "nbl/ui/CWindowAndroid.h"
 
+#include <fcntl.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 #include <linux/fb.h>
 

include/nbl/ui/KeyCodes.h

@@ -126,6 +126,7 @@ namespace nbl::ui
 		EKC_F23,
 		EKC_F24,
 
+		EKC_SEPARATOR,
 		EKC_NUM_LOCK,
 		EKC_SCROLL_LOCK,