aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/jack
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-09-02 19:25:46 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-09-02 19:25:46 +0000
commit66f6d57a08972314ede4efd3e3eec583ff1d1bb0 (patch)
treefe383671ac085071224128806d529ed5d67a3b0e /src/plugins/Output/jack
parentde0359b81556063c9c19fcfe76fdd21db655cd81 (diff)
downloadqmmp-66f6d57a08972314ede4efd3e3eec583ff1d1bb0.tar.gz
qmmp-66f6d57a08972314ede4efd3e3eec583ff1d1bb0.tar.bz2
qmmp-66f6d57a08972314ede4efd3e3eec583ff1d1bb0.zip
imported 0.2 fixes
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@540 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Output/jack')
-rw-r--r--src/plugins/Output/jack/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt
index 58bbfb6c8..52534f2ba 100644
--- a/src/plugins/Output/jack/CMakeLists.txt
+++ b/src/plugins/Output/jack/CMakeLists.txt
@@ -18,11 +18,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
SET(QT_INCLUDES
${QT_INCLUDES}
- ${CMAKE_CURRENT_BINARY_DIR}/../../../
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../
)
# libqmmp
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
# libjack and samplerate
@@ -52,6 +52,7 @@ QT4_WRAP_CPP(libjack_MOC_SRCS ${libjack_MOC_HDRS})
IF(JACK_FOUND)
ADD_LIBRARY(jack SHARED ${libjack_SRCS} ${libjack_MOC_SRCS} ${libjack_RCC_SRCS})
+add_dependencies(jack qmmp)
target_link_libraries(jack ${QT_LIBRARIES} -lqmmp ${JACK_LDFLAGS} ${JACK_CFLAGS})
install(TARGETS jack DESTINATION ${LIB_DIR}/qmmp/Output)
ENDIF(JACK_FOUND)