3 files changed, 9 insertions, 7 deletions
diff --git a/src/plugins/General/converter/CMakeLists.txt b/src/plugins/General/converter/CMakeLists.txt
index 07d06be59..180c967c2 100644
--- a/src/plugins/General/converter/CMakeLists.txt
+++ b/src/plugins/General/converter/CMakeLists.txt
@@ -29,6 +29,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
+# taglib
+include_directories(${TAGLIB_INCLUDE_DIRS})
+link_directories(${TAGLIB_LIBRARY_DIRS})
+ADD_DEFINITIONS(${TAGLIB_CFLAGS})
+
+
 SET(libconverter_SRCS
     converterfactory.cpp
     converter.cpp
@@ -66,5 +72,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(converter MODULE ${libconverter_SRCS} ${libconverter_MOC_SRCS} ${libconverter_UIS_H} ${libconverter_RCC_SRCS})
 add_dependencies(converter qmmpui)
-target_link_libraries(converter ${QT_LIBRARIES} -lqmmpui -lqmmp -ltag)
+target_link_libraries(converter ${QT_LIBRARIES} -lqmmpui -lqmmp ${TAGLIB_LDFLAGS})
 install(TARGETS converter DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/converter/converter.pro b/src/plugins/General/converter/converter.pro
index 927556ed5..853adc899 100644
--- a/src/plugins/General/converter/converter.pro
+++ b/src/plugins/General/converter/converter.pro
@@ -12,7 +12,7 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libconverter.so
 
 TEMPLATE = lib
 unix:QMAKE_LIBDIR += ../../../../lib
-unix:LIBS += -lqmmpui -lqmmp -ltag
+unix:LIBS += -lqmmpui -lqmmp
 
 PKGCONFIG += taglib
 
@@ -54,8 +54,3 @@ SOURCES += converterfactory.cpp \
 
 FORMS += converterdialog.ui \
     preseteditor.ui
-
-
-
-
-
diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt
index f19bdfa89..29a9c06b2 100644
--- a/src/plugins/General/hotkey/CMakeLists.txt
+++ b/src/plugins/General/hotkey/CMakeLists.txt
@@ -13,6 +13,7 @@ ADD_DEFINITIONS(-DQT_PLUGIN)
 ADD_DEFINITIONS(-DQT_NO_DEBUG)
 ADD_DEFINITIONS(-DQT_SHARED)
 ADD_DEFINITIONS(-DQT_THREAD)
+ADD_DEFINITIONS(${X11_CFLAGS})
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})