Commit 84f06d70 authored by Jaromil's avatar Jaromil
Browse files

reactivate luac precompilation using COMPILE_LUA=1

parent 2554f8e5
...@@ -35,6 +35,7 @@ sonarqube: ...@@ -35,6 +35,7 @@ sonarqube:
cp -v build/sonar-project.properties . cp -v build/sonar-project.properties .
./build/sonarqube.sh ./build/sonarqube.sh
embed-lua: lua_embed_opts := $(if ${COMPILE_LUA}, compile)
embed-lua: embed-lua:
@echo "Embedding all files in src/lua" @echo "Embedding all files in src/lua"
./build/embed-lualibs ${lua_embed_opts} ./build/embed-lualibs ${lua_embed_opts}
......
...@@ -136,6 +136,7 @@ ifneq (,$(findstring linux,$(MAKECMDGOALS))) ...@@ -136,6 +136,7 @@ ifneq (,$(findstring linux,$(MAKECMDGOALS)))
cflags := ${cflags} -fPIC ${cflags_protection} -D'ARCH=\"LINUX\"' -DARCH_LINUX cflags := ${cflags} -fPIC ${cflags_protection} -D'ARCH=\"LINUX\"' -DARCH_LINUX
ldflags := -lm -lpthread ldflags := -lm -lpthread
system := Linux system := Linux
cflags += $(if ${COMPILE_LUA}, -DLUA_COMPILED)
endif endif
ifneq (,$(findstring clang,$(MAKECMDGOALS))) ifneq (,$(findstring clang,$(MAKECMDGOALS)))
...@@ -247,6 +248,7 @@ endif ...@@ -247,6 +248,7 @@ endif
ifneq (,$(findstring debug,$(MAKECMDGOALS))) ifneq (,$(findstring debug,$(MAKECMDGOALS)))
cflags := -Og -ggdb -DDEBUG=1 -Wall -Wextra -pedantic cflags := -Og -ggdb -DDEBUG=1 -Wall -Wextra -pedantic
cflags += $(if ${COMPILE_LUA}, -DLUA_COMPILED)
endif endif
ifneq (,$(findstring profile,$(MAKECMDGOALS))) ifneq (,$(findstring profile,$(MAKECMDGOALS)))
......
...@@ -45,7 +45,7 @@ for i in ${(f)libs}; do ...@@ -45,7 +45,7 @@ for i in ${(f)libs}; do
print "+ $i $opts" print "+ $i $opts"
tmp=`mktemp -d` tmp=`mktemp -d`
if [[ "$opts" = "compile" ]]; then if [[ "$opts" = "compile" ]]; then
./build/luac -o ${tmp}/${n} $i luac5.3 -o ${tmp}/${n} $i
else else
cp $i ${tmp}/${n} cp $i ${tmp}/${n}
fi fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment