From a1ac349c22f43ece1dcad7b21ed82dbb434cbf06 Mon Sep 17 00:00:00 2001 From: sanine Date: Thu, 18 Aug 2022 20:59:53 -0500 Subject: remove Lua as library requirement --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf0ee15..8095e9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,6 @@ set(CMAKE_C_FLAGS "-Wall -Wextra -Werror -Wfatal-errors -Wpedantic") set(CMAKE_C_FLAGS "-g") find_package(OpenGL REQUIRED) -find_package(Lua51 REQUIRED) set(SRC_ROOT ${CMAKE_SOURCE_DIR}/src) set(LIB_ROOT ${CMAKE_SOURCE_DIR}/libs) @@ -22,6 +21,7 @@ link_directories(${LIB_ROOT}/honeysuckle) # add_library(glad ${SRC_ROOT}/gl/glad/glad.c) # add_library(stb_image src/stb_image/stb_image.c) +add_subdirectory(${LIB_ROOT}/lua-5.1.5) add_subdirectory(${LIB_ROOT}/assimp) add_subdirectory(${LIB_ROOT}/honeysuckle) add_subdirectory(${LIB_ROOT}/cglm) @@ -38,7 +38,7 @@ set(SOURCE_FILES add_executable(honey ${SOURCE_FILES}) -set(LIBRARIES ${LUA_LIBRARIES} honeysuckle assimp glad cairo m) +set(LIBRARIES lua5.1 honeysuckle assimp glad cairo m) if (WIN32) set(LIBRARIES ${LIBRARIES} glfw3 opengl32) else() @@ -64,4 +64,4 @@ add_executable(test EXCLUDE_FROM_ALL ${TEST_SOURCES}) set_target_properties(test PROPERTIES C_STANDARD 99 CMAKE_C_FLAGS "-Wall -Wextra -Werror -Wfatal-errors -Wpedantic") -target_link_libraries(test ${LUA_LIBRARIES} honeysuckle) +target_link_libraries(test lua5.1 honeysuckle) -- cgit v1.2.1