From 008017058f4fe14fd1ba2e44acdd12a5b4028a68 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 31 Jan 2016 12:20:18 +0100 Subject: [PATCH] Fix Lua compilation issues under Arch Linux. Patch from Martin Sandsmark. --- Makefile | 2 +- theme.cpp | 3 +-- theme.h | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) 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 #include -#include -#include +#include #include #include #include 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 -#include -#include +#include #include #include #include -- 2.39.2