Commit 146af0bd authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: fix breakage on Win32 because of moc versions

Consistency? what for?
parent 5de4956b
...@@ -224,9 +224,13 @@ resources.cpp: vlc.qrc $(DEPS_res) ...@@ -224,9 +224,13 @@ resources.cpp: vlc.qrc $(DEPS_res)
.hpp.moc.cpp: .hpp.moc.cpp:
if HAVE_DARWIN if HAVE_DARWIN
$(moc_verbose)$(MOC) -DQ_WS_MAC $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $< $(moc_verbose)$(MOC) -DQ_WS_MAC $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
else
if HAVE_WIN32
$(moc_verbose)$(MOC) -DWIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
else else
$(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -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 $@ $<
endif endif
endif
.ui.h: .ui.h:
$(AM_V_at)mkdir -p -- ui $(AM_V_at)mkdir -p -- ui
......
...@@ -133,7 +133,7 @@ private slots: ...@@ -133,7 +133,7 @@ private slots:
void lastfm_Changed( int ); void lastfm_Changed( int );
void updateAudioOptions( int ); void updateAudioOptions( int );
void updateAudioVolume( int ); void updateAudioVolume( int );
#ifdef SYS_MINGW32 #ifdef WIN32
void assoDialog(); void assoDialog();
void saveAsso(); void saveAsso();
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment