diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-17 00:41:28 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-17 00:41:28 +0000 |
| commit | e9db3e45ed0189bbe18125b120da394a5bc8a832 (patch) | |
| tree | 00d823f21189831c9d9146a368737a1d3a948d75 | |
| parent | bd72b76ea221da623efaf09fdce95ef415e773fa (diff) | |
| download | amarok-e9db3e45.tar.gz amarok-e9db3e45.zip | |
Fix ipod/Amarok compilation
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1228288 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | amarok/src/mediadevice/ipod/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | amarok/src/mediadevice/ipod/ipodmediadevice.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/amarok/src/mediadevice/ipod/CMakeLists.txt b/amarok/src/mediadevice/ipod/CMakeLists.txt index 393bae3e..4e672447 100644 --- a/amarok/src/mediadevice/ipod/CMakeLists.txt +++ b/amarok/src/mediadevice/ipod/CMakeLists.txt @@ -15,6 +15,8 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/amarok/src ${CMAKE_SOURCE_DIR}/amarok/src + ${CMAKE_SOURCE_DIR}/amarok/src/amarokcore + ${CMAKE_BINARY_DIR}/amarok/src/amarokcore #${CMAKE_SOURCE_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} @@ -37,6 +39,6 @@ install( FILES tde_add_kpart( libamarok_ipod-mediadevice AUTOMOC SOURCES ipodmediadevice.cpp - LINK amarok-shared + LINK amarok-shared glib-2.0 gpod DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index ab54cf88..97309761 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp @@ -1313,7 +1313,7 @@ IpodMediaDevice::detectModel() break; #ifdef HAVE_LIBGPOD_060 case ITDB_IPOD_MODEL_IPHONE_1: - case ITDB_IPOD_MODEL_TOUCH_BLACK: + case ITDB_IPOD_GENERATION_TOUCH_1: m_isIPhone = true; debug() << "detected iPhone/iPod Touch" << endl; break; |