AUTOMAKE_OPTIONS = subdir-objects
MOSTLYCLEANFILES = $(UIH)
-SUFFIXES = .ui .h .hpp .moc.cpp .mm
+SUFFIXES = .ui .h .hpp .moc.cpp
nodist_SOURCES_qt4 = \
main_interface.moc.cpp \
actions_manager.moc.cpp \
extensions_manager.moc.cpp \
recents.moc.cpp \
- variables.moc.cpp \
+ adapters/seekpoints.moc.cpp \
+ adapters/chromaprint.moc.cpp \
+ adapters/variables.moc.cpp \
dialogs/playlist.moc.cpp \
dialogs/bookmarks.moc.cpp \
dialogs/mediainfo.moc.cpp \
dialogs/vlm.moc.cpp \
dialogs/firstrun.moc.cpp \
dialogs/extensions.moc.cpp \
+ dialogs/fingerprintdialog.moc.cpp \
components/extended_panels.moc.cpp \
components/info_panels.moc.cpp \
+ components/info_widgets.moc.cpp \
components/preferences_widgets.moc.cpp \
components/complete_preferences.moc.cpp \
components/simple_preferences.moc.cpp \
components/sout/profile_selector.moc.cpp \
components/sout/sout_widgets.moc.cpp \
util/input_slider.moc.cpp \
+ util/timetooltip.moc.cpp \
util/customwidgets.moc.cpp \
util/searchlineedit.moc.cpp \
+ util/qmenuview.moc.cpp \
util/qvlcapp.moc.cpp \
util/pictureflow.moc.cpp \
util/buttons/RoundButton.moc.cpp \
ui/messages_panel.h \
ui/about.h \
ui/update.h \
+ ui/fingerprintdialog.h \
+ styles/seekstyle.moc.cpp \
dialogs/ml_configuration.moc.cpp \
components/playlist/ml_model.moc.cpp \
ui/sout.h
pixmaps/clear.png \
pixmaps/eject.png \
pixmaps/faster.png \
+ pixmaps/faster2.png \
pixmaps/go-next.png \
- pixmaps/progress.png \
+ pixmaps/menus/exit_16px.png \
pixmaps/menus/help_16px.png \
pixmaps/menus/info_16px.png \
pixmaps/menus/messages_16px.png \
pixmaps/playlist/repeat_one.png \
pixmaps/playlist/shuffle_off.png \
pixmaps/playlist/shuffle_on.png \
+ pixmaps/playlist/dropzone.png \
+ pixmaps/playlist/sidebar-icons/capture.png \
+ pixmaps/playlist/sidebar-icons/pictures.png \
+ pixmaps/playlist/sidebar-icons/disc.png \
+ pixmaps/playlist/sidebar-icons/playlist.png \
+ pixmaps/playlist/sidebar-icons/lan.png \
+ pixmaps/playlist/sidebar-icons/podcast.png \
+ pixmaps/playlist/sidebar-icons/library.png \
+ pixmaps/playlist/sidebar-icons/screen.png \
+ pixmaps/playlist/sidebar-icons/movie.png \
+ pixmaps/playlist/sidebar-icons/mtp.png \
+ pixmaps/playlist/sidebar-icons/music.png \
+ pixmaps/playlist/sidebar-icons/network.png \
+ pixmaps/playlist/sidebar-icons/sd/appletrailers.png \
+ pixmaps/playlist/sidebar-icons/sd/icecast.png \
+ pixmaps/playlist/sidebar-icons/sd/metachannels.png \
+ pixmaps/playlist/sidebar-icons/sd/katsomo.png \
+ pixmaps/playlist/sidebar-icons/sd/fmc.png \
+ pixmaps/playlist/sidebar-icons/sd/frenchtv.png \
+ pixmaps/playlist/sidebar-icons/sd/jamendo.png \
+ pixmaps/playlist/sidebar-icons/sd/assembleenationale.png \
pixmaps/prefs/advprefs_audio.png \
pixmaps/prefs/advprefs_codec.png \
pixmaps/prefs/advprefs_extended.png \
pixmaps/sample_minimal.png \
pixmaps/sample_skins.png \
pixmaps/slower.png \
+ pixmaps/slower2.png \
pixmaps/space.png \
pixmaps/stop.png \
pixmaps/stop_16px.png \
pixmaps/win7/win7thumbnail_next.png \
pixmaps/win7/win7thumbnail_play.png \
pixmaps/update.png \
+ pixmaps/valid.png \
+ pixmaps/search_clear.png \
pixmaps/lock.png
BUILT_SOURCES += $(nodist_SOURCES_qt4)
.hpp.moc.cpp:
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) $(CPPFLAGS_qt4) -o $@ $<
else
- $(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+if HAVE_WIN32
+ $(moc_verbose)$(MOC) -D_WIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
+else
+ $(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
+endif
endif
+# These MOC files depend on the configure settings:
+dialogs_provider.moc.cpp dialogs/vlm.moc.cpp: $(top_builddir)/config.h
+
.ui.h:
$(AM_V_at)mkdir -p -- ui
$(AM_V_at)rm -f $@ $@.tmp
$(AM_V_at)sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
$(AM_V_at)rm -f $@.tmp
-.mm.lo:
- $(top_builddir)/libtool --verbose --mode=compile $(CXX) $(objcxxflags) -DQ_WS_MAC -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cxxflags plugin qt4` -c $< -o $@
-
SOURCES_qt4 = qt4.cpp \
menus.cpp \
main_interface.cpp \
- main_interface_win32.cpp \
dialogs_provider.cpp \
input_manager.cpp \
actions_manager.cpp \
extensions_manager.cpp \
recents.cpp \
- variables.cpp \
+ adapters/seekpoints.cpp \
+ adapters/chromaprint.cpp \
+ adapters/variables.cpp \
dialogs/playlist.cpp \
dialogs/bookmarks.cpp \
dialogs/preferences.cpp \
dialogs/firstrun.cpp \
dialogs/podcast_configuration.cpp \
dialogs/extensions.cpp \
+ dialogs/fingerprintdialog.cpp \
components/extended_panels.cpp \
components/info_panels.cpp \
+ components/info_widgets.cpp \
components/preferences_widgets.cpp \
components/complete_preferences.cpp \
components/simple_preferences.cpp \
components/sout/profile_selector.cpp \
components/sout/sout_widgets.cpp \
util/input_slider.cpp \
+ util/timetooltip.cpp \
util/customwidgets.cpp \
util/searchlineedit.cpp \
util/registry.cpp \
+ util/qmenuview.cpp \
util/qt_dirs.cpp \
util/pictureflow.cpp \
util/buttons/BrowseButton.cpp \
util/buttons/DeckButtonsLayout.cpp \
- util/buttons/RoundButton.cpp
+ util/buttons/RoundButton.cpp \
+ styles/seekstyle.cpp
-if HAVE_DARWIN
-SOURCES_qt4 += util/searchlineedit_mac.mm
+if HAVE_WIN32
+SOURCES_qt4 += main_interface_win32.cpp
endif
noinst_HEADERS = \
actions_manager.hpp \
extensions_manager.hpp \
recents.hpp \
- variables.hpp \
+ adapters/seekpoints.hpp \
+ adapters/chromaprint.hpp \
+ adapters/variables.hpp \
dialogs/playlist.hpp \
dialogs/bookmarks.hpp \
dialogs/mediainfo.hpp \
dialogs/firstrun.hpp \
dialogs/podcast_configuration.hpp \
dialogs/extensions.hpp \
+ dialogs/fingerprintdialog.hpp \
components/extended_panels.hpp \
components/info_panels.hpp \
+ components/info_widgets.hpp \
components/preferences_widgets.hpp \
components/complete_preferences.hpp \
components/simple_preferences.hpp \
components/sout/sout_widgets.hpp \
components/sout/profiles.hpp \
util/input_slider.hpp \
+ util/timetooltip.hpp \
util/customwidgets.hpp \
util/searchlineedit.hpp \
util/qvlcframe.hpp \
util/qvlcapp.hpp \
+ util/qmenuview.hpp \
util/qt_dirs.hpp \
util/registry.hpp \
util/pictureflow.hpp \
util/singleton.hpp \
util/buttons/RoundButton.hpp \
util/buttons/DeckButtonsLayout.hpp \
- util/buttons/BrowseButton.hpp
+ util/buttons/BrowseButton.hpp \
+ styles/seekstyle.hpp
EXTRA_DIST += \
ui/update.ui \
ui/sout.ui \
ui/vlm.ui \
+ ui/fingerprintdialog.ui \
$(DEPS_res)
-
projects / vlc / blobdiff