Skip to content

refactor: change HTTP and WebSocket to use ixwebsocket #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: change HTTP and WebSocket to use ixwebsocket #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@
"DEBUG_LOG": "ON",
"ASAN_ENABLED": "ON",
"BUILD_STATIC_LIBRARY": "OFF",
"VCPKG_TARGET_TRIPLET": "x64-windows"
"VCPKG_TARGET_TRIPLET": "x64-windows",
"SPEED_UP_BUILD_UNITY": "OFF"
},
"architecture": {
"value": "x64",
Expand Down
6 changes: 6 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ find_package(pugixml CONFIG REQUIRED)
find_package(ZLIB REQUIRED)
find_package(httplib CONFIG REQUIRED)
find_package(fmt CONFIG REQUIRED)
find_package(ixwebsocket CONFIG REQUIRED)

if(APPLE)
# Required for Physfs
Expand Down Expand Up @@ -520,7 +521,9 @@ if(MSVC)
OpenAL::OpenAL
LibLZMA::LibLZMA
winmm.lib
bcrypt.lib
pugixml::pugixml
ixwebsocket::ixwebsocket
fmt::fmt-header-only
)
elseif(ANDROID)
Expand Down Expand Up @@ -569,6 +572,7 @@ elseif(ANDROID)
android
log
pugixml::pugixml
ixwebsocket::ixwebsocket
fmt::fmt-header-only
)

Expand Down Expand Up @@ -616,6 +620,7 @@ elseif(WASM)
# OpenAL::OpenAL (using emscripten openal api)
LibLZMA::LibLZMA
pugixml::pugixml
ixwebsocket::ixwebsocket
ZLIB::ZLIB
OpenSSL::SSL
OpenSSL::Crypto
Expand Down Expand Up @@ -699,6 +704,7 @@ else() # Linux
OpenAL::OpenAL
LibLZMA::LibLZMA
pugixml::pugixml
ixwebsocket::ixwebsocket
ZLIB::ZLIB
OpenSSL::SSL
OpenSSL::Crypto
Expand Down
10 changes: 10 additions & 0 deletions src/framework/luaengine/luavaluecasts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ bool luavalue_cast(const int index, double& d)
}

// string
int push_luavalue(const char* cstr)
{
if (!cstr) {
g_lua.pushNil();
} else {
g_lua.pushString(cstr);
}
return 1;
}

int push_luavalue(const std::string_view str)
{
g_lua.pushString(str);
Expand Down
Loading
Loading