From 85ad3f79b52bd8f6de7dee557909211a618f319d Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 30 Sep 2017 11:10:40 +0200 Subject: [PATCH] Silence more warnings --- source/bridges-ui/Makefile | 2 +- source/modules/dgl/src/NanoVG.cpp | 4 ++-- source/theme/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/bridges-ui/Makefile b/source/bridges-ui/Makefile index 0b8200fd1..7f42daf5b 100644 --- a/source/bridges-ui/Makefile +++ b/source/bridges-ui/Makefile @@ -37,7 +37,7 @@ LINK_GTK2_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs gtk+-2.0) -ldl BUILD_GTK3_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_GTK3 $(shell pkg-config --cflags gtk+-3.0) LINK_GTK3_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs gtk+-3.0) -ldl -BUILD_QT4_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_QT4 $(shell pkg-config --cflags QtCore QtGui) -I$(OBJDIR) -I$(CWD)/theme +BUILD_QT4_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_QT4 $(shell pkg-config --cflags QtCore QtGui) -I$(OBJDIR) -I$(CWD)/theme -Wno-unused-variable LINK_QT4_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui) -ldl BUILD_QT5_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_QT5 $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets) -I$(OBJDIR) -I$(CWD)/theme diff --git a/source/modules/dgl/src/NanoVG.cpp b/source/modules/dgl/src/NanoVG.cpp index ee4add07f..6600428c6 100644 --- a/source/modules/dgl/src/NanoVG.cpp +++ b/source/modules/dgl/src/NanoVG.cpp @@ -972,7 +972,7 @@ END_NAMESPACE_DGL #undef final -#if defined(__GNUC__) && (__GNUC__ >= 5) +#if defined(__GNUC__) && (__GNUC__ >= 6) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wno-misleading-indentation" #endif @@ -981,7 +981,7 @@ extern "C" { #include "nanovg/nanovg.c" } -#if defined(__GNUC__) && (__GNUC__ >= 5) +#if defined(__GNUC__) && (__GNUC__ >= 6) # pragma GCC diagnostic pop #endif diff --git a/source/theme/Makefile b/source/theme/Makefile index 743cd1dc0..c9f3aacd9 100644 --- a/source/theme/Makefile +++ b/source/theme/Makefile @@ -185,7 +185,7 @@ $(OBJDIR)/resources.qt5.cpp: $(CWD)/../resources/resources-theme.qrc $(OBJDIR)/%.qt4.cpp.o: $(OBJDIR)/%.qt4.cpp $(OBJDIR)/moc_CarlaStyle.qt4.cpp -@mkdir -p $(OBJDIR) @echo "Compiling $*.cpp (Qt4)" - @$(CXX) $< $(QT4_CXX_FLAGS) -c -o $@ + @$(CXX) $< $(QT4_CXX_FLAGS) -Wno-unused-variable -c -o $@ $(OBJDIR)/%.qt5.cpp.o: $(OBJDIR)/%.qt5.cpp $(OBJDIR)/moc_CarlaStyle.qt5.cpp -@mkdir -p $(OBJDIR)