Skip to content

Commit

Permalink
deps: use kunitoki/LuaBridge3
Browse files Browse the repository at this point in the history
  • Loading branch information
scribam committed Nov 2, 2024
1 parent da3cfd9 commit 601b2fd
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,12 @@ if(NOT LIBRETRO)
find_package(Lua 5.2)
if(NOT APPLE AND LUA_FOUND)
target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
target_include_directories(${PROJECT_NAME} PRIVATE ${LUA_INCLUDE_DIR} core/deps/luabridge/Source)
target_include_directories(${PROJECT_NAME} PRIVATE ${LUA_INCLUDE_DIR})
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()

Expand Down
1 change: 1 addition & 0 deletions core/deps/LuaBridge3
Submodule LuaBridge3 added at 87f36c
1 change: 0 additions & 1 deletion core/deps/luabridge
Submodule luabridge deleted from fab7b3

0 comments on commit 601b2fd

Please sign in to comment.