fix xmake fix back

diff bug

rebase bug

windows only

rebase bug on tui

fix rebase bug

fix setting resolve

rebase bug

rebase bug

rebase bug

rebase bug

Author: Yangff

UE4SS/include/GUI/TUI.hpp

@@ -9,12 +9,13 @@ namespace RC::GUI
       public:
         auto init() -> void override;
         auto imgui_backend_newframe() -> void override;
-        auto create_window() -> void override;
+        auto create_window(int loc_x, int loc_y, int size_x, int size_y) -> void override;
         auto exec_message_loop(bool* exit_requested) -> void override;
         auto shutdown() -> void override;
         auto cleanup() -> void override;
         auto get_window_handle() -> void* override;
         auto get_window_size() -> WindowSize override;
+        auto get_window_position() -> WindowPosition override;
         auto on_gfx_backend_set() -> void override;
     };
 

UE4SS/include/Mod/CppUserModBase.hpp

@@ -136,7 +136,7 @@ namespace RC
         RC_UE4SS_API virtual auto render_tab() -> void{};
 
       protected:
-        RC_UE4SS_API auto register_tab(std::wstring_view tab_name, GUI::GUITab::RenderFunctionType) -> void;
+        RC_UE4SS_API auto register_tab(UEStringViewType tab_name, GUI::GUITab::RenderFunctionType) -> void;
         RC_UE4SS_API auto register_keydown_event(Input::Key, const Input::EventCallbackCallable&, uint8_t custom_data = 0) -> void;
         RC_UE4SS_API auto register_keydown_event(Input::Key, const Input::Handler::ModifierKeyArray&, const Input::EventCallbackCallable&, uint8_t custom_data = 0)
                 -> void;

UE4SS/src/GUI/GUI.cpp

@@ -13,6 +13,8 @@
 #ifdef HAS_D3D11
 #include <GUI/DX11.hpp>
 #endif
+#else
+#define sscanf_s sscanf
 #endif
 
 #ifdef HAS_GLFW
@@ -504,17 +506,19 @@ namespace RC::GUI
         IMGUI_CHECKVERSION();
         ImGui::CreateContext();
         ImGuiIO& io = ImGui::GetIO();
-        m_imgui_ini_file = to_string(StringType{UE4SSProgram::get_program().get_working_directory()} + STR("\\imgui.ini"));
+        m_imgui_ini_file = to_string_path(std::filesystem::path {UE4SSProgram::get_program().get_working_directory()} / SYSSTR("imgui.ini"));
         io.IniFilename = m_imgui_ini_file.c_str();
 
         // Add .ini handle for UserData type
+        #ifdef WIN32
         ImGuiSettingsHandler ini_handler;
         ini_handler.TypeName = "UE4SSData";
         ini_handler.TypeHash = ImHashStr("UE4SSData");
         ini_handler.ReadOpenFn = imgui_ue4ss_data_read_open;
         ini_handler.ReadLineFn = imgui_ue4ss_data_read_line;
         ini_handler.WriteAllFn = imgui_ue4ss_data_write_all;
         ImGui::AddSettingsHandler(&ini_handler);
+        #endif
 
         ImGui::LoadIniSettingsFromDisk(m_imgui_ini_file.c_str());
 

UE4SS/src/GUI/LiveView.cpp

@@ -350,7 +350,7 @@ namespace RC::GUI
         }
 
         auto json_file =
-                File::open(std::filesystem::path{UE4SSProgram::get_program().get_working_directory()} / SYSSTR("UE4SS-config") SYSSTR("liveview")SYSSTR("filters.meta.json")),
+                File::open(std::filesystem::path{UE4SSProgram::get_program().get_working_directory()} / SYSSTR("UE4SS-config") SYSSTR("liveview")SYSSTR("filters.meta.json"),
                            File::OpenFor::Writing,
                            File::OverwriteExistingFile::Yes,
                            File::CreateIfNonExistent::Yes);
@@ -409,7 +409,7 @@ namespace RC::GUI
     static auto internal_load_filters_from_disk() -> void
     {
         const auto json_file =
-                File::open(std::filesystem::path{UE4SSProgram::get_program().get_working_directory()} / SYSSTR("UE4SS-config") / SYSSTR("liveview") / SYSSTR("filters.meta.json")),
+                File::open(std::filesystem::path{UE4SSProgram::get_program().get_working_directory()} / SYSSTR("UE4SS-config") / SYSSTR("liveview") / SYSSTR("filters.meta.json"),
                            File::OpenFor::Reading,
                            File::OverwriteExistingFile::No,
                            File::CreateIfNonExistent::Yes);

UE4SS/src/GUI/Platform/TUI/TUI.cpp

@@ -58,11 +58,16 @@ namespace RC::GUI
         }
     }
 
-    void Backend_TUI::create_window()
+    void Backend_TUI::create_window(int loc_x, int loc_y, int size_x, int size_y)
     {
         // Do nothing
     }
 
+    WindowPosition Backend_TUI::get_window_position()
+    {
+        return {0, 0};
+    }
+
     void Backend_TUI::exec_message_loop(bool* exit_requested)
     {
         ImTui_ImplNcurses_ProcessEvent();

UE4SS/src/UE4SSProgram.cpp

@@ -57,7 +57,10 @@
 #include <Unreal/World.hpp>
 #include <UnrealDef.hpp>
 
+#ifdef WIN32
 #include <polyhook2/PE/IatHook.hpp>
+#endif
+
 #include <Platform.hpp>
 
 namespace RC
@@ -463,10 +466,10 @@ namespace RC
         else
         {
             // Check for legacy locations and update paths accordingly
-            resolaved_settings_file = File::get_path_if_exists(m_legacy_root_directory, m_settings_file_name);
-            if (resolaved_settings_file)
+            auto resolaved_legacy_settings_file = File::get_path_if_exists(m_legacy_root_directory, m_settings_file_name);
+            if (resolaved_legacy_settings_file)
             {
-                m_settings_path_and_file = *resolaved_settings_file;
+                m_settings_path_and_file = *resolaved_legacy_settings_file;
             } else {
                 throw std::runtime_error{"UE4SS-Settings.ini file not found"};
             }
@@ -1444,11 +1447,6 @@ namespace RC
         return m_module_file_path_str;
     }
 
-    auto UE4SSProgram::get_game_executable_directory() -> File::StringViewType
-    {
-        return m_game_executable_directory.c_str();
-    }
-
     auto UE4SSProgram::get_working_directory() -> SystemStringViewType
     {
         m_working_directory_str = to_system_string(m_working_directory);

deps/first/Input/include/Input/Handler.hpp

@@ -29,12 +29,9 @@ namespace RC::Input
         ModifierKeys required_modifier_keys{};
         EventCallbackCallable callback{};
         uint8_t custom_data{};
-<<<<<<< HEAD
         void* custom_data2{};
         bool requires_modifier_keys{};
         bool is_down{};
-=======
->>>>>>> 83b273a (Add input source for Linux TUI and update input handler initialization)
     };
 
     struct KeySet

deps/third/xmake.lua

@@ -1,12 +1 @@
-includes("zycore")
-includes("zydis")
-includes("polyhook_2")
-includes("glaze")
--- includes("imtui")
-includes("imgui")
-includes("glad")
-includes("raw_pdb")
-
-add_requires("zycore v1.5.0", { debug = is_mode_debug(), configs = { runtimes = get_mode_runtimes() } })
-add_requires("zydis v4.1.0", { debug = is_mode_debug(), configs = { runtimes = get_mode_runtimes() } })
-add_requires("polyhook_2", { debug = is_mode_debug(), configs = { runtimes = get_mode_runtimes() } })
+includes("glad")

deps/xmake.lua

@@ -2,3 +2,10 @@
 includes("first")
 -- Third party dependencies
 includes("third")
+-- Third party dependencies repository
+-- Everything that is an xmake package should be inside of this repository
+add_repositories("third-party deps/third-repo", { rootdir = get_config("ue4ssRoot") })
+
+add_requires("zycore v1.5.0", { debug = is_mode_debug(), configs = {runtimes = get_mode_runtimes()} })
+add_requires("zydis v4.1.0", { debug = is_mode_debug(), configs = {runtimes = get_mode_runtimes()} })
+add_requires("polyhook_2", { debug = is_mode_debug(), configs = {runtimes = get_mode_runtimes()} })

xmake.lua

@@ -1,42 +1,18 @@
-set_xmakever("2.9.2")
 -- We should use `get_config("ue4ssRoot")` instead of `os.projectdir()` or `$(projectdir)`.
 -- This is because os.projectdir() will return a higher parent dir
 -- when UE4SS is sub-moduled/`include("UE4SS")` in another xmake project.
 set_config("ue4ssRoot", os.scriptdir())
 
-includes("tools/xmakescripts/build_configs.lua")
-includes("tools/xmakescripts/configurations.lua")
-
-add_rules(get_unreal_rules())
-
--- Restrict the compilation modes/configs.
-set_allowedplats("windows", "linux")
-if is_plat("windows") then
-    set_allowedarchs("x64")
-elseif is_plat("linux") then
-    set_allowedarchs("x86_64")
-    set_defaultarchs("x86_64")
-    set_toolchains("clang", "rust")
-end
-set_allowedmodes(get_compilation_modes())
-
-if is_plat("windows") then
-    set_defaultmode("Game__Shipping__Win64")
-    set_runtimes(get_mode_runtimes())
-elseif is_plat("linux") then
-    set_defaultmode("Game__Shipping__Linux")
-end
-
--- All non-binary outputs are stored in the Intermediates dir.
+-- All non-binary outputs are written to the Intermediates dir.
 set_config("buildir", "Intermediates")
 
 -- Any lua modules in this directory can be imported in the script scope by using
 -- /modules/my_module.lua           import("my_module")
 -- /modules/rules/my_module.lua     import("rules.my_module")
 add_moduledirs("tools/xmakescripts/modules")
 
--- Load our rule files into the global scope.
-includes("tools/xmakescripts/rules/**.lua")
+-- Load the build_rules file into the global scope.
+includes("tools/xmakescripts/rules/build_rules.lua")
 
 -- Generate the mode rules.
 local modes = generate_compilation_modes()
@@ -121,4 +97,4 @@ function ue4ss_init()
     end
 end
 
-ue4ss_init()
+ue4ss_init()