aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortcsullivan <tullivan99@gmail.com>2019-08-25 16:41:52 -0400
committertcsullivan <tullivan99@gmail.com>2019-08-25 16:41:52 -0400
commit91db024dcb491a71349d60c1410732c97db6bb3a (patch)
tree6413a5ac5a3d8d97149e10f086a66b3eb366854d
parentbb283f4581ac07a4dd75325c4343d7f28b1ff376 (diff)
linked luajit
-rw-r--r--Makefile2
-rw-r--r--lib/LuaJIT/src/Makefile1
-rw-r--r--lib/libluajit.abin0 -> 868920 bytes
3 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 749b464..b498fdd 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ CC = gcc
CXX = g++
LIBDIR = lib
-LIBS = -L$(LIBDIR) -lSDL2 -lpthread -lentityx
+LIBS = -L$(LIBDIR) -lSDL2 -lpthread -lentityx -lluajit
CXXFLAGS = -ggdb -std=c++17 \
-Wall -Wextra -Werror -pedantic \
diff --git a/lib/LuaJIT/src/Makefile b/lib/LuaJIT/src/Makefile
index d22eb73..1b70b05 100644
--- a/lib/LuaJIT/src/Makefile
+++ b/lib/LuaJIT/src/Makefile
@@ -600,6 +600,7 @@ E= @echo
##############################################################################
default all: $(TARGET_T)
+ @cp $(LUAJIT_A) ../..
amalg:
@grep "^[+|]" ljamalg.c
diff --git a/lib/libluajit.a b/lib/libluajit.a
new file mode 100644
index 0000000..76c6fbe
--- /dev/null
+++ b/lib/libluajit.a
Binary files differ