From 7213a2161184f20ae28bf23950d32659ceec4960 Mon Sep 17 00:00:00 2001 From: Yuri Date: Sun, 9 Feb 2020 09:58:23 -0800 Subject: [PATCH] Remove CPPFLAGS from moc command lines. moc isn't a C++ compiler and some C++ flags caus it to fail (ex. -isystem). --- src/projectM-pulseaudio/Makefile.am | 2 +- src/projectM-qt/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/projectM-pulseaudio/Makefile.am b/src/projectM-pulseaudio/Makefile.am index bcdf80e1d4..abddad8e48 100644 --- a/src/projectM-pulseaudio/Makefile.am +++ b/src/projectM-pulseaudio/Makefile.am @@ -12,7 +12,7 @@ projectM_pulseaudio_qtheaders = \ nodist_projectM_pulseaudio_moc_sources = $(projectM_pulseaudio_qtheaders:.hpp=_moc.cpp) .hpp_moc.cpp: - $(MOC) -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $< + $(MOC) -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $< ui_PulseDeviceChooserDialog.h: PulseDeviceChooserDialog.ui $(UIC) -o $@ $< diff --git a/src/projectM-qt/Makefile.am b/src/projectM-qt/Makefile.am index e3f117865a..ec01c15ede 100644 --- a/src/projectM-qt/Makefile.am +++ b/src/projectM-qt/Makefile.am @@ -21,7 +21,7 @@ projectM_qt_qtheaders = qprojectm_mainwindow.hpp \ nodist_projectM_qt_moc_sources = $(projectM_qt_qtheaders:.hpp=_moc.cpp) .hpp_moc.cpp: - $(MOC) -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $< + $(MOC) -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $< ui_qprojectm_mainwindow.h: qprojectm_mainwindow.ui $(UIC) -o $@ $<