Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 14:15:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #334 from wheremyfoodat/delete-emu

Browse source 
Add libuv to lua bindings
This commit is contained in:
wheremyfoodat 2024-02-01 20:00:14 +00:00 • committed by GitHub
commit 880cc20fcf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -49,3 +49,9 @@
[submodule "third_party/oaknut"]
path = third_party/oaknut
url = https://github.com/merryhime/oaknut
[submodule "third_party/luv"]
path = third_party/luv
url = https://github.com/luvit/luv
[submodule "third_party/libuv"]
path = third_party/libuv
url = https://github.com/libuv/libuv

15
CMakeLists.txt
View file

@ -266,6 +266,16 @@ set(THIRD_PARTY_SOURCE_FILES third_party/imgui/imgui.cpp
third_party/xxhash/xxhash.c
)
if(ENABLE_LUAJIT AND NOT ANDROID)
# Build luv and libuv for Lua TCP server usage if we're not on Android
include_directories(third_party/luv/src)
include_directories(third_party/luv/deps/lua-compat-5.3/c-api)
include_directories(third_party/libuv/include)
set(THIRD_PARTY_SOURCE_FILES ${THIRD_PARTY_SOURCE_FILES} third_party/luv/src/luv.c)
set(LIBUV_BUILD_SHARED OFF)
add_subdirectory(third_party/libuv)
endif()
if(ENABLE_QT_GUI)
include_directories(third_party/duckstation)
@ -433,6 +443,11 @@ endif()
if(ENABLE_LUAJIT)
target_compile_definitions(Alber PUBLIC "PANDA3DS_ENABLE_LUA=1")
target_link_libraries(Alber PRIVATE libluajit)
# If we're not on Android, link libuv too
if (NOT ANDROID)
target_link_libraries(Alber PRIVATE uv_a)
endif()
endif()
if(ENABLE_OPENGL)

15
src/lua.cpp
View file

@ -1,6 +1,12 @@
#ifdef PANDA3DS_ENABLE_LUA
#include "lua_manager.hpp"
#ifndef __ANDROID__
extern "C" {
#include "luv.h"
}
#endif
void LuaManager::initialize() {
L = luaL_newstate(); // Open Lua
@ -9,10 +15,15 @@ void LuaManager::initialize() {
initialized = false;
return;
}
luaL_openlibs(L);
initializeThunks();
#ifndef __ANDROID__
lua_pushstring(L, "luv");
luaopen_luv(L);
lua_settable(L, LUA_GLOBALSINDEX);
#endif
initializeThunks();
initialized = true;
haveScript = false;
}

1
third_party/libuv vendored Submodule

@ -0,0 +1 @@
Subproject commit b8368a1441fd4ebdaaae70b67136c80b1a98be32

1
third_party/luv vendored Submodule

@ -0,0 +1 @@
Subproject commit 3e55ac4331d06aa5f43016a142aa2aaa23264105