From a3a3ddc777e243e8dcb697e5042fcb75a2ee1a9f Mon Sep 17 00:00:00 2001 From: Ryn Date: Sat, 18 May 2024 13:43:52 -0700 Subject: [PATCH] updated to latest ue4ss main --- ExamplePluginMod/xmake.lua | 23 +++-------------------- GBVSRollback/xmake.lua | 25 ++----------------------- GGSTBPPlayer/xmake.lua | 25 ++----------------------- MVCIViewer/xmake.lua | 25 ++----------------------- ModuleManagerMod/xmake.lua | 26 ++------------------------ RE-UE4SS | 2 +- 6 files changed, 12 insertions(+), 114 deletions(-) diff --git a/ExamplePluginMod/xmake.lua b/ExamplePluginMod/xmake.lua index b192066..5715f75 100644 --- a/ExamplePluginMod/xmake.lua +++ b/ExamplePluginMod/xmake.lua @@ -1,27 +1,10 @@ local projectName = "ExamplePluginMod" target(projectName) - set_kind("shared") - set_languages("cxx20") - set_exceptions("cxx") + add_rules("ue4ss.mod") add_files("src/dllmain.cpp") add_deps( - "UE4SS", "Function", "ModuleManagerMod" - ) - - on_load(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:set_output_dir(target) - end) - - on_config(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:config(target) - end) - - after_clean(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:clean_output_dir(target) - end) \ No newline at end of file + "Function", "ModuleManagerMod" + ) \ No newline at end of file diff --git a/GBVSRollback/xmake.lua b/GBVSRollback/xmake.lua index 4d3307f..188ad19 100644 --- a/GBVSRollback/xmake.lua +++ b/GBVSRollback/xmake.lua @@ -1,9 +1,7 @@ local projectName = "GBVSRollback" target(projectName) - set_kind("shared") - set_languages("cxx20") - set_exceptions("cxx") + add_rules("ue4ss.mod") add_includedirs("include", { public = true }) add_headerfiles("include/**.hpp") @@ -11,23 +9,4 @@ target(projectName) add_files("src/dllmain.cpp") add_files("src/PatternFinder.cpp") add_files("src/BattleState.cpp") - add_files("src/Particles.cpp") - - add_deps( - "UE4SS" - ) - - on_load(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:set_output_dir(target) - end) - - on_config(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:config(target) - end) - - after_clean(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:clean_output_dir(target) - end) \ No newline at end of file + add_files("src/Particles.cpp") \ No newline at end of file diff --git a/GGSTBPPlayer/xmake.lua b/GGSTBPPlayer/xmake.lua index 42b6659..7e34a09 100644 --- a/GGSTBPPlayer/xmake.lua +++ b/GGSTBPPlayer/xmake.lua @@ -1,27 +1,6 @@ local projectName = "GGSTBPPlayer" target(projectName) - set_kind("shared") - set_languages("cxx20") - set_exceptions("cxx") + add_rules("ue4ss.mod") - add_files("src/dllmain.cpp") - - add_deps( - "UE4SS" - ) - - on_load(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:set_output_dir(target) - end) - - on_config(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:config(target) - end) - - after_clean(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:clean_output_dir(target) - end) \ No newline at end of file + add_files("src/dllmain.cpp") \ No newline at end of file diff --git a/MVCIViewer/xmake.lua b/MVCIViewer/xmake.lua index 8e1f110..902cc9e 100644 --- a/MVCIViewer/xmake.lua +++ b/MVCIViewer/xmake.lua @@ -1,31 +1,10 @@ local projectName = "MVCIViewer" target(projectName) - set_kind("shared") - set_languages("cxx20") - set_exceptions("cxx") + add_rules("ue4ss.mod") add_includedirs("include", { public = true }) add_headerfiles("include/**.hpp") add_files("src/dllmain.cpp") - add_files("src/math_util.cpp") - - add_deps( - "UE4SS" - ) - - on_load(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:set_output_dir(target) - end) - - on_config(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:config(target) - end) - - after_clean(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:clean_output_dir(target) - end) \ No newline at end of file + add_files("src/math_util.cpp") \ No newline at end of file diff --git a/ModuleManagerMod/xmake.lua b/ModuleManagerMod/xmake.lua index a7cd971..1dbac39 100644 --- a/ModuleManagerMod/xmake.lua +++ b/ModuleManagerMod/xmake.lua @@ -3,9 +3,7 @@ local projectName = "ModuleManagerMod" add_requires("raw_pdb", { debug = is_mode_debug(), configs = { runtimes = get_mode_runtimes() } }) target(projectName) - set_kind("shared") - set_languages("cxx20") - set_exceptions("cxx") + add_rules("ue4ss.mod") add_includedirs("include", { public = true }) add_headerfiles("include/**.hpp") @@ -13,24 +11,4 @@ target(projectName) add_files("src/ModuleManager.cpp") add_files("src/SymbolResolver.cpp") - add_deps( - "UE4SS" - ) - - add_packages("raw_pdb") - - - on_load(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:set_output_dir(target) - end) - - on_config(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:config(target) - end) - - after_clean(function (target) - import("build_configs", { rootdir = get_config("scriptsRoot") }) - build_configs:clean_output_dir(target) - end) \ No newline at end of file + add_packages("raw_pdb") \ No newline at end of file diff --git a/RE-UE4SS b/RE-UE4SS index 95e98ca..59689b9 160000 --- a/RE-UE4SS +++ b/RE-UE4SS @@ -1 +1 @@ -Subproject commit 95e98ca988487568758f9446fbbb76f5be055eeb +Subproject commit 59689b942c4dc879b15da7b6099d3dc1d92a8321