fix: safetyhook compilation

UE4SS-RE · Sep 12, 2024 · 54a7d37 · 54a7d37
1 parent 24125b1
commit 54a7d37
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 25 deletions.
diff --git a/UE4SS/proxy_generator/proxy/xmake.lua b/UE4SS/proxy_generator/proxy/xmake.lua
@@ -5,7 +5,7 @@ option("ue4ssProxyPath")
 target("proxy")
     set_kind("shared")
     add_options("ue4ssProxyPath")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("c++", "asm")
 

diff --git a/UE4SS/proxy_generator/xmake.lua b/UE4SS/proxy_generator/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "proxy_generator"
 
 target(projectName)
     set_kind("binary")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
 
     add_files("main.cpp")

diff --git a/UVTD/xmake.lua b/UVTD/xmake.lua
@@ -4,7 +4,7 @@ add_requires("raw_pdb", { debug = is_mode_debug(), configs = {runtimes = get_mod
 
 target(projectName)
     set_kind("binary")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
 
     add_includedirs("include", { public = true })

diff --git a/deps/first/ASMHelper/xmake.lua b/deps/first/ASMHelper/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "ASMHelper"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/ArgsParser/xmake.lua b/deps/first/ArgsParser/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "ArgsParser"
 
 target(projectName)
     set_kind("binary")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/Constructs/xmake.lua b/deps/first/Constructs/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "Constructs"
 
 target(projectName)
     set_kind("headeronly")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/DynamicOutput/xmake.lua b/deps/first/DynamicOutput/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "DynamicOutput"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/File/xmake.lua b/deps/first/File/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "File"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/Function/xmake.lua b/deps/first/Function/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "Function"
 
 target(projectName)
     set_kind("headeronly")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/Helpers/xmake.lua b/deps/first/Helpers/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "Helpers"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/IniParser/xmake.lua b/deps/first/IniParser/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "IniParser"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/Input/xmake.lua b/deps/first/Input/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "Input"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/JSON/xmake.lua b/deps/first/JSON/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "JSON"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/LuaMadeSimple/xmake.lua b/deps/first/LuaMadeSimple/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "LuaMadeSimple"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/LuaRaw/xmake.lua b/deps/first/LuaRaw/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "LuaRaw"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
     add_includedirs("include", { public = true })

diff --git a/deps/first/MProgram/xmake.lua b/deps/first/MProgram/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "MProgram"
 
 target(projectName)
     set_kind("headeronly")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/ParserBase/xmake.lua b/deps/first/ParserBase/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "ParserBase"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/Profiler/xmake.lua b/deps/first/Profiler/xmake.lua
@@ -11,7 +11,7 @@ option("profilerFlavor")
 target(projectName)
     set_kind("headeronly")
     add_options("profilerFlavor")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/ScopedTimer/xmake.lua b/deps/first/ScopedTimer/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "ScopedTimer"
 
 target(projectName)
     set_kind("headeronly")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/SinglePassSigScanner/xmake.lua b/deps/first/SinglePassSigScanner/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "SinglePassSigScanner"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/String/xmake.lua b/deps/first/String/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "String"
 
 target(projectName)
     set_kind("headeronly")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/third-repo/packages/i/imguitextedit/xmake.lua b/deps/third-repo/packages/i/imguitextedit/xmake.lua
@@ -23,7 +23,7 @@ package("ImGuiTextEdit")
 
             target("ImGuiTextEdit")
                 set_kind("static")
-                set_languages("cxx20")
+                set_languages("cxx23")
 
                 add_includedirs(".", { public = true })
                 add_headerfiles("*.h")

diff --git a/deps/third-repo/packages/s/safetyhook/xmake.lua b/deps/third-repo/packages/s/safetyhook/xmake.lua
@@ -10,7 +10,7 @@ package("safetyhook")
         local configs = {}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=OFF")
-        import("package.tools.cmake").install(package, configs)
+        import("package.tools.cmake").install(package, configs, { packagedeps = {"zydis", "zycore"} })
 
         os.cp("include/*.hpp", package:installdir("include"))
         os.cp("include/safetyhook/*.hpp", package:installdir("include/safetyhook"))

diff --git a/deps/third/glad/xmake.lua b/deps/third/glad/xmake.lua
@@ -1,6 +1,6 @@
 target("glad")
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
 
     add_includedirs("include", { public = true })

diff --git a/tools/xmakescripts/rules/build_rules.lua b/tools/xmakescripts/rules/build_rules.lua
@@ -221,7 +221,7 @@ rule("ue4ss.mod")
     add_deps("ue4ss.base", {order = true})
     after_load(function(target)
         target:set("kind", "shared")
-        target:set("languages", "cxx20")
+        target:set("languages", "cxx23")
         target:set("exceptions", "cxx")
         target:add("deps", "UE4SS")
         target:set("group", "mods")