From 901d3e2355115eabe24f60dfdbd02186967e1fff Mon Sep 17 00:00:00 2001 From: Riyyi Date: Sun, 24 Jan 2021 02:00:16 +0100 Subject: [PATCH] Add Lua dependency --- .gitmodules | 3 +++ CMakeLists.txt | 5 ++++- README.org | 2 +- inferno/vendor/lua/lua | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) create mode 160000 inferno/vendor/lua/lua diff --git a/.gitmodules b/.gitmodules index 0e1962c..255d276 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "inferno/vendor/entt"] path = inferno/vendor/entt url = https://github.com/skypjack/entt +[submodule "inferno/vendor/lua/lua"] + path = inferno/vendor/lua/lua + url = https://github.com/lua/lua diff --git a/CMakeLists.txt b/CMakeLists.txt index 3775690..7431c66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,13 +52,16 @@ include_directories( "${ENGINE}/vendor/glfw/include" "${ENGINE}/vendor/glm" "${ENGINE}/vendor/json/include" + "${ENGINE}/vendor/lua" "${ENGINE}/vendor/stb" ) # Define engine source files file(GLOB_RECURSE GLAD "${ENGINE}/vendor/glad/*.c") +file(GLOB_RECURSE LUA "${ENGINE}/vendor/lua/*.c") +list(REMOVE_ITEM LUA "${CMAKE_SOURCE_DIR}/${ENGINE}/vendor/lua/lua/lua.c") # Do not compile stand-alone main() file(GLOB_RECURSE ENGINE_SOURCES "${ENGINE}/src/${ENGINE}/*.cpp") -set(ENGINE_SOURCES ${GLAD} ${ENGINE_SOURCES}) +set(ENGINE_SOURCES ${GLAD} ${LUA} ${ENGINE_SOURCES}) # Define game source files file(GLOB_RECURSE GAME_SOURCES "${GAME}/src/*.cpp") diff --git a/README.org b/README.org index 8483a9f..2ba0702 100644 --- a/README.org +++ b/README.org @@ -40,7 +40,7 @@ Or - [[https://github.com/glfw/glfw][GLFW]] - [[https://github.com/g-truc/glm][GLM]] - [[https://github.com/nlohmann/json][JSON]] -# - [[https://github.com/lua/lua][Lua]] +- [[https://github.com/lua/lua][Lua]] - [[https://github.com/nothings/stb][stb]] * References diff --git a/inferno/vendor/lua/lua b/inferno/vendor/lua/lua new file mode 160000 index 0000000..825ac8e --- /dev/null +++ b/inferno/vendor/lua/lua @@ -0,0 +1 @@ +Subproject commit 825ac8eca8e384d6ad2538b5670088c31e08a9d7