Merge pull request #324 from yurivict/master

Remove CPPFLAGS from moc command lines. moc isn't a C++ compiler and some C++ flags caus it to fail (ex. -isystem).
This commit is contained in:
Mischa Spiegelmock
2020-02-09 21:07:24 +02:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

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

View File

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