diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-01-23 19:08:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-01-23 19:08:06 +0000 |
| commit | eaec3fcd3ad09a85cdd83946bc0201faea6e3aba (patch) | |
| tree | 956b3079858fac4fe1c74cd841aad79389215888 | |
| parent | d3f1937f200122373ce8fcb7c9ac8a52d55d7bdc (diff) | |
| download | qmmp-eaec3fcd3ad09a85cdd83946bc0201faea6e3aba.tar.gz qmmp-eaec3fcd3ad09a85cdd83946bc0201faea6e3aba.tar.bz2 qmmp-eaec3fcd3ad09a85cdd83946bc0201faea6e3aba.zip | |
fixed build with --as-needed linking flag
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@756 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt b/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt index 1b606ee3f..f1d9b9985 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt +++ b/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt @@ -25,6 +25,7 @@ SET(QT_INCLUDES # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) +link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) SET(libqmmpfiledialog_SRCS qmmpfiledialogimpl.cpp @@ -57,5 +58,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(qmmpfiledialog SHARED ${libqmmpfiledialog_SRCS} ${libqmmpfiledialog_MOC_SRCS} ${libqmmpfiledialog_UIS_H} ${libqmmpfiledialog_RCC_SRCS}) add_dependencies(qmmpfiledialog qmmpui) -target_link_libraries(qmmpfiledialog ${QT_LIBRARIES} -lqmmpui) +target_link_libraries(qmmpfiledialog ${QT_LIBRARIES} -lqmmpui -lqmmp) install(TARGETS qmmpfiledialog DESTINATION ${LIB_DIR}/qmmp/FileDialogs) diff --git a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro index d9e58c46a..f3fcc75e4 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro +++ b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro @@ -23,7 +23,7 @@ CONFIG += release warn_on plugin TEMPLATE = lib QMAKE_LIBDIR += ../../../../lib -LIBS += -lqmmpui +LIBS += -lqmmpui -lqmmp isEmpty(LIB_DIR){ LIB_DIR = /lib |