Update submodules

gta-chaos-mod · Jan 12, 2025 · ec70904 · ec70904
1 parent e89b547
commit ec70904
Show file tree

Hide file tree

Showing 11 changed files with 35,004 additions and 29,608 deletions.
diff --git a/ChaosMod/CMakeLists.txt b/ChaosMod/CMakeLists.txt
@@ -29,7 +29,7 @@ else()
     target_link_options(ChaosMod PRIVATE -static)
 endif()
 
-target_include_directories(ChaosMod PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../vendor ${PROJECT_SOURCE_DIR}/../vendor/websocketpp)
+target_include_directories(ChaosMod PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../vendor ${PROJECT_SOURCE_DIR}/../vendor/lua/include ${PROJECT_SOURCE_DIR}/../vendor/websocketpp)
 
 set(link_libs shv minhook lua54 winmm d3dcompiler xinput)
 

diff --git a/ChaosMod/Components/LuaScripts.h b/ChaosMod/Components/LuaScripts.h
@@ -6,7 +6,7 @@
 
 #define SOL_ALL_SAFETIES_ON 1
 #define SOL_SAFE_NUMERICS 1
-#include <sol3/sol.hpp>
+#include <sol/sol.hpp>
 
 #include <json.hpp>
 

diff --git a/ChaosMod/stdafx.h b/ChaosMod/stdafx.h
@@ -18,10 +18,6 @@
 #include <scripthookv/inc/main.h>
 #include <scripthookv/inc/natives.h>
 
-#define SOL_ALL_SAFETIES_ON 1
-#define SOL_SAFE_NUMERICS 1
-#include <sol3/sol.hpp>
-
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 

diff --git a/vendor/IXWebSocket b/vendor/IXWebSocket
+2 −0		.gitignore
+2 −3		CMakeLists.txt
+3 −0		README.md
+4 −0		docs/CHANGELOG.md
+11 −0		docs/usage.md
+6 −0		ixwebsocket/IXDNSLookup.cpp
+16 −6		ixwebsocket/IXHttp.cpp
+6 −2		ixwebsocket/IXSelectInterruptPipe.cpp
+5 −1		ixwebsocket/IXSetThreadName.cpp
+4 −0		ixwebsocket/IXSocket.h
+17 −0		ixwebsocket/IXSocketMbedTLS.cpp
+6 −4		ixwebsocket/IXUrlParser.cpp
+2 −2		ixwebsocket/IXWebSocket.cpp
+4 −1		ixwebsocket/IXWebSocketHandshake.cpp
+5 −1		ixwebsocket/IXWebSocketServer.cpp
+4 −1		ixwebsocket/IXWebSocketServer.h
+1 −1		ixwebsocket/IXWebSocketVersion.h
+7 −7		makefile.dev
+1 −0		test/CMakeLists.txt
+34 −0		test/IXUrlParserTest.cpp
+144 −0		test/IXWebSocketHostTest.cpp