diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-02-20 15:17:55 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-02-20 15:17:55 +0000 |
| commit | f7922b3fd6e83b04f07f036e56023017bc5bacfa (patch) | |
| tree | 45d348a4a5a8df26645b8063d08d2a6b93d9770e /src/plugins | |
| parent | 4b6239e2e5ee0c8c06240fcb01c92f55d2e757e3 (diff) | |
| download | qmmp-f7922b3fd6e83b04f07f036e56023017bc5bacfa.tar.gz qmmp-f7922b3fd6e83b04f07f036e56023017bc5bacfa.tar.bz2 qmmp-f7922b3fd6e83b04f07f036e56023017bc5bacfa.zip | |
make alsa plugin use pkg-config
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@251 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/Output/alsa/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/plugins/Output/alsa/alsa.pro | 9 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/plugins/Output/alsa/CMakeLists.txt b/src/plugins/Output/alsa/CMakeLists.txt index f28d63fca..ce9c0aeae 100644 --- a/src/plugins/Output/alsa/CMakeLists.txt +++ b/src/plugins/Output/alsa/CMakeLists.txt @@ -26,7 +26,14 @@ SET(QT_INCLUDES # libqmmp include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) -link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) +link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) + +# alsa +PKGCONFIG(alsa ALSA_INCLUDE_DIR ALSA_LINK_DIR ALSA_LINK_FLAGS ALSA_CFLAGS) + +IF(NOT ALSA_LINK_FLAGS) + SET(ALSA_LINK_FLAGS -lasound) +ENDIF(NOT ALSA_LINK_FLAGS) SET(libalsa_SRCS outputalsa.cpp @@ -60,6 +67,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(alsa SHARED ${libalsa_SRCS} ${libalsa_MOC_SRCS} ${libalsa_UIS_H} ${libalsa_RCC_SRCS}) -target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp -lasound) +target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp ${ALSA_LINK_FLAGS}) install(TARGETS alsa DESTINATION ${LIB_DIR}/qmmp/Output PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/src/plugins/Output/alsa/alsa.pro b/src/plugins/Output/alsa/alsa.pro index 853621e18..dc365c740 100644 --- a/src/plugins/Output/alsa/alsa.pro +++ b/src/plugins/Output/alsa/alsa.pro @@ -16,9 +16,14 @@ QMAKE_LIBDIR += ../../../../lib CONFIG += release \ warn_on \ thread \ -plugin +plugin \ +link_pkgconfig + TEMPLATE = lib -LIBS += -lqmmp -lasound +LIBS += -lqmmp +#-lasound +PKGCONFIG += alsa + FORMS += settingsdialog.ui #TRANSLATIONS = translations/alsa_plugin_ru.ts #RESOURCES = translations/translations.qrc |