diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-12-22 09:33:31 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-12-22 09:33:31 +0000 |
| commit | ff85d16aad8dbc9ae118aa81f4741bf46b1b53d5 (patch) | |
| tree | 7dd3a489bb0736617423549d957dbc798dd18b95 /src | |
| parent | ac1f3775990561224c69543f7fbcf31e62fd0109 (diff) | |
| download | qmmp-ff85d16aad8dbc9ae118aa81f4741bf46b1b53d5.tar.gz qmmp-ff85d16aad8dbc9ae118aa81f4741bf46b1b53d5.tar.bz2 qmmp-ff85d16aad8dbc9ae118aa81f4741bf46b1b53d5.zip | |
fixed build
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3086 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/PlayListFormats/PlayListFormats.pro (renamed from src/plugins/PlayListFormats/PlaylistFormats.pro) | 0 | ||||
| -rw-r--r-- | src/plugins/PlayListFormats/m3u/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/PlayListFormats/m3u/m3u.pro | 2 | ||||
| -rw-r--r-- | src/plugins/PlayListFormats/pls/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/PlayListFormats/pls/pls.pro | 4 | ||||
| -rw-r--r-- | src/plugins/PlayListFormats/xspf/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/PlayListFormats/xspf/xspf.pro | 2 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 2 | ||||
| -rw-r--r-- | src/qmmpui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qmmpui/playlistparser.cpp | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 37542f3bc..93e37c976 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -7,7 +7,7 @@ add_subdirectory(Output) add_subdirectory(Visual) add_subdirectory(Effect) add_subdirectory(General) -add_subdirectory(PlaylistFormats) +add_subdirectory(PlayListFormats) add_subdirectory(CommandLineOptions) add_subdirectory(FileDialogs) add_subdirectory(Transports) diff --git a/src/plugins/PlayListFormats/PlaylistFormats.pro b/src/plugins/PlayListFormats/PlayListFormats.pro index f214cffff..f214cffff 100644 --- a/src/plugins/PlayListFormats/PlaylistFormats.pro +++ b/src/plugins/PlayListFormats/PlayListFormats.pro diff --git a/src/plugins/PlayListFormats/m3u/CMakeLists.txt b/src/plugins/PlayListFormats/m3u/CMakeLists.txt index f7a18fb07..cbed694fe 100644 --- a/src/plugins/PlayListFormats/m3u/CMakeLists.txt +++ b/src/plugins/PlayListFormats/m3u/CMakeLists.txt @@ -46,4 +46,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(m3uplaylistformat MODULE ${libm3uplaylistformat_SRCS} ${libm3uplaylistformat_MOC_SRCS}) add_dependencies(m3uplaylistformat qmmpui) target_link_libraries(m3uplaylistformat ${QT_LIBRARIES} -lqmmpui) -install(TARGETS m3uplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlaylistFormats) +install(TARGETS m3uplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats) diff --git a/src/plugins/PlayListFormats/m3u/m3u.pro b/src/plugins/PlayListFormats/m3u/m3u.pro index b4a435c7f..952165a9d 100644 --- a/src/plugins/PlayListFormats/m3u/m3u.pro +++ b/src/plugins/PlayListFormats/m3u/m3u.pro @@ -5,7 +5,7 @@ warn_on \ plugin \ lib -TARGET =$$PLUGINS_PREFIX/PlaylistFormats/m3uplaylistformat +TARGET =$$PLUGINS_PREFIX/PlayListFormats/m3uplaylistformat TEMPLATE = lib QMAKE_LIBDIR += ../../../../lib diff --git a/src/plugins/PlayListFormats/pls/CMakeLists.txt b/src/plugins/PlayListFormats/pls/CMakeLists.txt index 29c49f73c..4e221e436 100644 --- a/src/plugins/PlayListFormats/pls/CMakeLists.txt +++ b/src/plugins/PlayListFormats/pls/CMakeLists.txt @@ -46,4 +46,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(plsplaylistformat MODULE ${libplsplaylistformat_SRCS} ${libplsplaylistformat_MOC_SRCS}) add_dependencies(plsplaylistformat qmmpui) target_link_libraries(plsplaylistformat ${QT_LIBRARIES} -lqmmpui) -install(TARGETS plsplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlaylistFormats) +install(TARGETS plsplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats) diff --git a/src/plugins/PlayListFormats/pls/pls.pro b/src/plugins/PlayListFormats/pls/pls.pro index 006e0aa63..60681f3ee 100644 --- a/src/plugins/PlayListFormats/pls/pls.pro +++ b/src/plugins/PlayListFormats/pls/pls.pro @@ -5,7 +5,7 @@ warn_on \ plugin \ lib -TARGET =$$PLUGINS_PREFIX/PlaylistFormats/plsplaylistformat +TARGET =$$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat TEMPLATE = lib @@ -24,7 +24,7 @@ unix { target.path = $$LIB_DIR/qmmp/PlaylistFormats INSTALLS += target - QMAKE_CLEAN =$$PLUGINS_PREFIX/PlaylistFormats/plsplaylistformat.so + QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat.so LIBS += -lqmmpui } diff --git a/src/plugins/PlayListFormats/xspf/CMakeLists.txt b/src/plugins/PlayListFormats/xspf/CMakeLists.txt index f4a27ac22..b9ae8bd81 100644 --- a/src/plugins/PlayListFormats/xspf/CMakeLists.txt +++ b/src/plugins/PlayListFormats/xspf/CMakeLists.txt @@ -51,4 +51,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(xspfplaylistformat MODULE ${libxspfplaylistformat_SRCS} ${libxspfplaylistformat_MOC_SRCS}) add_dependencies(xspfplaylistformat qmmpui) target_link_libraries(xspfplaylistformat ${QT_LIBRARIES} -lqmmpui -lqmmp) -install(TARGETS xspfplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlaylistFormats) +install(TARGETS xspfplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats) diff --git a/src/plugins/PlayListFormats/xspf/xspf.pro b/src/plugins/PlayListFormats/xspf/xspf.pro index 28a50ca44..e36b7d04c 100644 --- a/src/plugins/PlayListFormats/xspf/xspf.pro +++ b/src/plugins/PlayListFormats/xspf/xspf.pro @@ -5,7 +5,7 @@ warn_on \ plugin \ lib -TARGET =$$PLUGINS_PREFIX/PlaylistFormats/xspfplaylistformat +TARGET =$$PLUGINS_PREFIX/PlayListFormats/xspfplaylistformat TEMPLATE = lib diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index b21e12fb5..facdc240c 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -4,7 +4,7 @@ SUBDIRS += Input \ Visual \ Transports \ Effect \ - PlaylistFormats \ + PlayListFormats \ FileDialogs \ Ui diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt index 177f8eef9..4e9559a6c 100644 --- a/src/qmmpui/CMakeLists.txt +++ b/src/qmmpui/CMakeLists.txt @@ -61,11 +61,11 @@ SET(libqmmpui_HDRS uifactory.h pluginitem_p.h general.h + playlistparser.h ) SET(libqmmpui_MOC_HDRS uihelper.h - playlistparser.h filedialog.h qtfiledialog_p.h fileloader_p.h diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp index 04c7378da..aa14ec214 100644 --- a/src/qmmpui/playlistparser.cpp +++ b/src/qmmpui/playlistparser.cpp @@ -61,7 +61,7 @@ void PlayListParser::checkFormats() m_formats = new QList<PlayListFormat*>(); QDir pluginsDir (Qmmp::pluginsPath()); - pluginsDir.cd("PlaylistFormats"); + pluginsDir.cd("PlayListFormats"); foreach (QString fileName, pluginsDir.entryList(QDir::Files)) { QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); |
