From a83f4d04da6f8c7ea0203c88d6e39b64b3cb5b22 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 10 Nov 2017 17:19:34 +0100 Subject: [PATCH] Switch to LuaJIT; faster, less allocation-heavy and no real downsides. --- Makefile | 2 +- README | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 902d2c1..ff9b4b5 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ CXX=g++ PROTOC=protoc INSTALL=install EMBEDDED_BMUSB=no -PKG_MODULES := Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL Qt5PrintSupport libusb-1.0 movit lua52 libmicrohttpd epoxy x264 protobuf libpci +PKG_MODULES := Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL Qt5PrintSupport libusb-1.0 movit luajit libmicrohttpd epoxy x264 protobuf libpci CXXFLAGS ?= -O2 -g -Wall # Will be overridden by environment. CXXFLAGS += -std=gnu++11 -fPIC $(shell pkg-config --cflags $(PKG_MODULES)) -pthread -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\" -Idecklink/ diff --git a/README b/README index 7fb863e..62c2471 100644 --- a/README +++ b/README @@ -67,7 +67,7 @@ Nageru is in beta stage. It currently needs: - libzita-resampler, for resampling sound sources so that they are in sync between sources, and also for oversampling for the peak meter. - - Lua, for driving the theme engine. + - LuaJIT, for driving the theme engine. - libpci, for printing friendly PCI device names in an error message. @@ -76,7 +76,7 @@ If on Debian stretch or something similar, you can install everything you need with: apt install qtbase5-dev libqt5opengl5-dev qt5-default libqcustomplot-dev \ - pkg-config libmicrohttpd-dev libusb-1.0-0-dev liblua5.2-dev \ + pkg-config libmicrohttpd-dev libusb-1.0-0-dev libluajit-5.1-dev \ libzita-resampler-dev libva-dev libavcodec-dev libavformat-dev \ libswscale-dev libavresample-dev libmovit-dev libegl1-mesa-dev \ libasound2-dev libx264-dev libbmusb-dev protobuf-compiler \ -- 2.39.2