Browse Source

Silence more warnings

tags/1.9.8
falkTX 7 years ago
parent
commit
85ad3f79b5
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      source/bridges-ui/Makefile
  2. +2
    -2
      source/modules/dgl/src/NanoVG.cpp
  3. +1
    -1
      source/theme/Makefile

+ 1
- 1
source/bridges-ui/Makefile View File

@@ -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


+ 2
- 2
source/modules/dgl/src/NanoVG.cpp View File

@@ -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



+ 1
- 1
source/theme/Makefile View File

@@ -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)


Loading…
Cancel
Save