From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 24 Jul 2016 22:26:32 +0000 (+0200)
Subject: Remove -Werror again; it keeps creeping in.
X-Git-Tag: 1.3.3~25
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e7150a9c9896a1aac5091a2c4ceb9e57f8aeeefb;p=nageru

Remove -Werror again; it keeps creeping in.
---

diff --git a/Makefile b/Makefile
index 1422406..25c29b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-CXX=g++ -fsanitize=address
+CXX=g++
 PKG_MODULES = Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL libusb-1.0 movit lua52 libmicrohttpd epoxy x264
-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)\" -Idecklink/
+CXXFLAGS := -O2 -march=native -g -std=gnu++11 -Wall -Wno-deprecated-declarations -fPIC $(shell pkg-config --cflags $(PKG_MODULES)) -pthread -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\" -Idecklink/
 LDFLAGS=$(shell pkg-config --libs $(PKG_MODULES)) -lEGL -lGL -pthread -lva -lva-drm -lva-x11 -lX11 -lavformat -lavcodec -lavutil -lswscale -lavresample -lzita-resampler -lasound -ldl
 
 # Qt objects