From bfd2dac9d18d3a27aa7a3b5a57878351900d6ed5 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Thu, 8 Oct 2009 16:39:33 +0000
Subject: fixed build

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1293 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/hotkey/CMakeLists.txt | 5 ++++-
 src/plugins/General/hotkey/hotkey.pro     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt
index eee444f7b..6742dfca9 100644
--- a/src/plugins/General/hotkey/CMakeLists.txt
+++ b/src/plugins/General/hotkey/CMakeLists.txt
@@ -24,6 +24,9 @@ SET(QT_INCLUDES
 
 pkg_check_modules(X11 xf86miscproto x11)
 
+include_directories(${X11_INCLUDE_DIRS})
+link_directories(${X11_LIBRARY_DIRS})
+
 # libqmmpui & libqmmp
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
@@ -67,6 +70,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 IF(X11_FOUND)
 ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_MOC_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS})
 add_dependencies(hotkey qmmpui)
-target_link_libraries(hotkey ${QT_LIBRARIES} -lqmmpui -lqmmp)
+target_link_libraries(hotkey ${QT_LIBRARIES} -lqmmpui -lqmmp ${X11_LDFLAGS})
 install(TARGETS hotkey DESTINATION ${LIB_DIR}/qmmp/General)
 ENDIF(X11_FOUND)
diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro
index 21ef268f3..f7f7376f0 100644
--- a/src/plugins/General/hotkey/hotkey.pro
+++ b/src/plugins/General/hotkey/hotkey.pro
@@ -3,7 +3,10 @@ include(../../plugins.pri)
 CONFIG += release \
 warn_on \
 plugin  \
- lib
+ lib  \
+ link_pkgconfig
+
+PKGCONFIG += xf86miscproto x11
 
 TARGET = $$PLUGINS_PREFIX/General/hotkey
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhotkey.so
-- 
cgit v1.2.3-13-gbd6f