Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
73f81994
Commit
73f81994
authored
Jan 17, 2011
by
Jean-Philippe André
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: fix Modules.am for the media library
MOC files should not be created if the ML is not built
parent
90b6e3dc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
configure.ac
configure.ac
+1
-0
modules/gui/qt4/Modules.am
modules/gui/qt4/Modules.am
+9
-5
No files found.
configure.ac
View file @
73f81994
...
...
@@ -4222,6 +4222,7 @@ if test "${enable_media_library}" == "yes"; then
VLC_ADD_PLUGIN([media_library])
fi
fi
AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" != "no"])
dnl
dnl Endianness check
...
...
modules/gui/qt4/Modules.am
View file @
73f81994
...
...
@@ -26,7 +26,6 @@ nodist_SOURCES_qt4 = \
dialogs/playlist.moc.cpp \
dialogs/bookmarks.moc.cpp \
dialogs/mediainfo.moc.cpp \
dialogs/ml_configuration.moc.cpp \
dialogs/extended.moc.cpp \
dialogs/messages.moc.cpp \
dialogs/epg.moc.cpp \
...
...
@@ -60,8 +59,6 @@ nodist_SOURCES_qt4 = \
components/epg/EPGWidget.moc.cpp \
components/playlist/views.moc.cpp \
components/playlist/vlc_model.moc.cpp \
components/playlist/ml_item.moc.cpp \
components/playlist/ml_model.moc.cpp \
components/playlist/playlist_model.moc.cpp \
components/playlist/playlist.moc.cpp \
components/playlist/standardpanel.moc.cpp \
...
...
@@ -95,6 +92,13 @@ nodist_SOURCES_qt4 = \
ui/update.h \
ui/sout.h
if ENABLE_MEDIA_LIBRARY
nodist_SOURCES_qt4 +=
dialogs/ml_configuration.moc.cpp \
components/playlist/ml_item.moc.cpp \
components/playlist/ml_model.moc.cpp
endif
DEPS_res = \
pixmaps/arrow_down_dark.png \
pixmaps/clear.png \
...
...
@@ -347,8 +351,8 @@ noinst_HEADERS = \
components/epg/EPGView.hpp \
components/epg/EPGWidget.hpp \
components/playlist/views.hpp \
components/playlist/ml_item.hpp \
components/playlist/ml_model.hpp \
components/playlist/ml_item.hpp \
components/playlist/ml_model.hpp \
components/playlist/vlc_model.hpp \
components/playlist/playlist_model.hpp \
components/playlist/playlist_item.hpp \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment