rm lua submodule;

This commit is contained in:
bjorn 2021-03-22 12:07:56 -06:00
parent 5ef5ac5f22
commit 49f02c65d8
3 changed files with 2 additions and 16 deletions

View File

@ -105,20 +105,12 @@ if(LOVR_USE_LUAJIT AND NOT EMSCRIPTEN)
set(LOVR_LUA libluajit)
endif()
else()
if(EMSCRIPTEN)
option(LUA_USE_RELATIVE_LOADLIB OFF)
option(LUA_USE_ULONGJMP OFF)
option(LUA_USE_POPEN OFF)
endif()
if(LOVR_SYSTEM_LUA)
pkg_search_module(LUA REQUIRED lua)
include_directories(${LUA_INCLUDE_DIRS})
set(LOVR_LUA ${LUA_LIBRARIES})
else()
add_subdirectory(deps/lua lua)
include_directories(deps/lua/src ${CMAKE_BINARY_DIR}/lua)
set(LOVR_LUA liblua_static)
set_target_properties(lua luac PROPERTIES EXCLUDE_FROM_ALL 1)
message(FATAL_ERROR "Vanillua does not work on this commit")
endif()
endif()

View File

@ -198,12 +198,7 @@ ifneq (@(CMAKE_DEPS),)
LIBS_$(macos) += $(BUILD)/luajit/src/libluajit.dylib
LIBS_$(linux) += $(BUILD)/luajit/src/libluajit.so
else
CFLAGS += -I$(DEPS)/lua/src -I$(BUILD)/lua
LDFLAGS_$(win32) += -L$(BUILD)/lua/$(CONFIG) -llua
LDFLAGS_$(macos) += -L$(BUILD)/lua -llua
LDFLAGS_$(linux) += -L$(BUILD)/lua -llua
LDFLAGS_$(android) += -L$(BUILD)/lua -llua
LDFLAGS_$(web) += $(BUILD)/lua/liblua.a
error "Vanillua does not work on this commit"
endif
# GLFW

1
deps/lua vendored

@ -1 +0,0 @@
Subproject commit d2e7e7d4d43ff9068b279a617c5b2ca2c2771676