From c076cca693f8c58d9c32d4ea5cddcb2767efdd23 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 4 Oct 2015 02:55:02 +0200 Subject: [PATCH] Take the Movit shader directory from pkg-config. --- Makefile | 2 +- mixer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 04e658b..16bd2b5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CXX=g++ -CXXFLAGS := -O2 -march=native -g -std=gnu++11 -Wall -Wno-deprecated-declarations -fPIC $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions libusb-1.0 movit) -pthread +CXXFLAGS := -O2 -march=native -g -std=gnu++11 -Wall -Wno-deprecated-declarations -fPIC $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions libusb-1.0 movit) -pthread -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\" LDFLAGS=$(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions libusb-1.0 movit) -lEGL -lGL -pthread -lva -lva-drm -lva-x11 -lX11 -lavformat -lavcodec -lavutil # Qt objects diff --git a/mixer.cpp b/mixer.cpp index 11553b4..d7726f3 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -205,7 +205,7 @@ void mixer_thread_func(QSurface *surface, QSurface *surface2, QSurface *surface3 exit(1); } - CHECK(init_movit("/usr/share/movit", MOVIT_DEBUG_ON)); + CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF)); check_error(); EffectChain chain(WIDTH, HEIGHT); -- 2.39.5