From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 31 Jan 2016 11:20:18 +0000 (+0100)
Subject: Fix Lua compilation issues under Arch Linux. Patch from Martin Sandsmark.
X-Git-Tag: 1.1.0~24
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=008017058f4fe14fd1ba2e44acdd12a5b4028a68

Fix Lua compilation issues under Arch Linux. Patch from Martin Sandsmark.
---

diff --git a/Makefile b/Makefile
index 27d0750..9222684 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CXX=g++
-PKG_MODULES = Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL libusb-1.0 movit lua5.2 libmicrohttpd
+PKG_MODULES = Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL libusb-1.0 movit lua52 libmicrohttpd
 CXXFLAGS := -O2 -march=native -g -std=gnu++11 -Wall -Wno-deprecated-declarations -Werror -fPIC $(shell pkg-config --cflags $(PKG_MODULES)) -pthread -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\"
 LDFLAGS=$(shell pkg-config --libs $(PKG_MODULES)) -lEGL -lGL -pthread -lva -lva-drm -lva-x11 -lX11 -lavformat -lavcodec -lavutil -lswscale -lzita-resampler -lasound
 
diff --git a/theme.cpp b/theme.cpp
index 0c74a8b..7e69f91 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -2,8 +2,7 @@
 
 #include <assert.h>
 #include <lauxlib.h>
-#include <lua.h>
-#include <lualib.h>
+#include <lua.hpp>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/image_format.h>
diff --git a/theme.h b/theme.h
index 660a2cd..20d7367 100644
--- a/theme.h
+++ b/theme.h
@@ -2,8 +2,7 @@
 #define _THEME_H 1
 
 #include <epoxy/gl.h>
-#include <lauxlib.h>
-#include <lua.h>
+#include <lua.hpp>
 #include <movit/effect_chain.h>
 #include <movit/deinterlace_effect.h>
 #include <movit/ycbcr_input.h>