[vlc-commits] commit: qt4: don't use CPPFLAGS for moc, since it isn' t necessary and just creates trouble on Mac ( Felix Paul Kühne )

git at videolan.org git at videolan.org
Sun Aug 1 16:54:59 CEST 2010


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Aug  1 16:54:55 2010 +0200| [1fd11f79ab5c45fd63daeb99a4953686eed0736f] | committer: Felix Paul Kühne 

qt4: don't use CPPFLAGS for moc, since it isn't necessary and just creates trouble on Mac

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1fd11f79ab5c45fd63daeb99a4953686eed0736f
---

 modules/gui/qt4/Modules.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 01fd039..968ed19 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -206,7 +206,7 @@ resources.cpp: vlc.qrc $(DEPS_res)
 	$(AM_V_GEN)$(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-	$(moc_verbose)$(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+	$(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
 	$(AM_V_at)mkdir -p -- ui



More information about the vlc-commits mailing list