From 252b1ae7cf27202d3435a4816093136188f7b11c Mon Sep 17 00:00:00 2001 From: scribam Date: Sat, 7 Dec 2024 23:20:54 +0100 Subject: [PATCH] deps: use kunitoki/LuaBridge3 --- .gitmodules | 6 +++--- CMakeLists.txt | 3 +++ core/deps/LuaBridge3 | 1 + core/deps/luabridge | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) create mode 160000 core/deps/LuaBridge3 delete mode 160000 core/deps/luabridge diff --git a/.gitmodules b/.gitmodules index 14fe5f2ac..bf3df0fd6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,9 +5,6 @@ path = core/deps/libchdr url = https://github.com/rtissera/libchdr.git ignore = dirty -[submodule "core/deps/luabridge"] - path = core/deps/luabridge - url = https://github.com/vinniefalco/LuaBridge.git [submodule "core/deps/breakpad"] path = core/deps/breakpad url = https://github.com/flyinghead/mingw-breakpad @@ -41,3 +38,6 @@ [submodule "core/deps/googletest"] path = core/deps/googletest url = https://github.com/google/googletest.git +[submodule "core/deps/LuaBridge3"] + path = core/deps/LuaBridge3 + url = https://github.com/kunitoki/LuaBridge3.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 7114589fb..5ddfab3c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -481,6 +481,9 @@ if(NOT LIBRETRO) target_include_directories(${PROJECT_NAME} PRIVATE ${LUA_INCLUDE_DIR} core/deps/luabridge/Source) list(TRANSFORM LUA_LIBRARIES REPLACE "\.dll" "") target_link_libraries(${PROJECT_NAME} PRIVATE ${LUA_LIBRARIES}) + + add_subdirectory(core/deps/LuaBridge3) + target_link_libraries(${PROJECT_NAME} PRIVATE LuaBridge) endif() endif() endif() diff --git a/core/deps/LuaBridge3 b/core/deps/LuaBridge3 new file mode 160000 index 000000000..87f36c968 --- /dev/null +++ b/core/deps/LuaBridge3 @@ -0,0 +1 @@ +Subproject commit 87f36c9688ed7e153380f6cf78675be1be3fde05 diff --git a/core/deps/luabridge b/core/deps/luabridge deleted file mode 160000 index fab7b33b8..000000000 --- a/core/deps/luabridge +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fab7b33b896a42dcc865ba5ecdbacd9f409137f8