Browse Source

Add Lua dependency

master
Riyyi 4 years ago
parent
commit
901d3e2355
  1. 3
      .gitmodules
  2. 5
      CMakeLists.txt
  3. 2
      README.org
  4. 1
      inferno/vendor/lua/lua

3
.gitmodules vendored

@ -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

5
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")

2
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

1
inferno/vendor/lua/lua vendored

@ -0,0 +1 @@
Subproject commit 825ac8eca8e384d6ad2538b5670088c31e08a9d7
Loading…
Cancel
Save