diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-10-15 08:37:10 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-10-15 08:37:10 +0000 |
| commit | f3a81cc15b9cbd3787869e2a4a32fcd82c90c8c4 (patch) | |
| tree | ea8ee22a814847e60cec5fa1bba38fe8471dc67e /src/plugins/General/converter | |
| parent | 6fe2f98c9a5a2e581a4bbd613b1c80ffc29ad7d3 (diff) | |
| download | qmmp-f3a81cc15b9cbd3787869e2a4a32fcd82c90c8c4.tar.gz qmmp-f3a81cc15b9cbd3787869e2a4a32fcd82c90c8c4.tar.bz2 qmmp-f3a81cc15b9cbd3787869e2a4a32fcd82c90c8c4.zip | |
fixed incorrect cflags usage
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2401 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/converter')
| -rw-r--r-- | src/plugins/General/converter/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/plugins/General/converter/converter.pro | 7 |
2 files changed, 8 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 - - - - - |