Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly copy and fix up spotify blob on mac.

Browse Source
This commit is contained in:
John Maguire 2011-04-28 20:37:13 +00:00
parent d51c99382e
commit b45e11712a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/macdeploy.py vendored
View File

@ -424,6 +424,11 @@ for plugin in GSTREAMER_PLUGINS:
FixPlugin(FindGstreamerPlugin('gst-plugin-scanner'), '.') FixPlugin(FindGstreamerPlugin('gst-plugin-scanner'), '.')
try:
FixPlugin('clementine-spotifyblob', '.')
except:
'Failed to find spotify blob'
for plugin in QT_PLUGINS: for plugin in QT_PLUGINS:
FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin)) FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))

11
src/CMakeLists.txt
View File

@ -1021,6 +1021,8 @@ endif(HAVE_BREAKPAD)
if(HAVE_SPOTIFY) if(HAVE_SPOTIFY)
target_link_libraries(clementine_lib clementine-spotifyblob-messages) target_link_libraries(clementine_lib clementine-spotifyblob-messages)
add_dependencies(clementine_lib
clementine-spotifyblob)
endif(HAVE_SPOTIFY) endif(HAVE_SPOTIFY)
if (APPLE) if (APPLE)
@ -1138,18 +1140,11 @@ if (APPLE)
WORLD_READ WORLD_EXECUTE) WORLD_READ WORLD_EXECUTE)
endif (HAVE_BREAKPAD) endif (HAVE_BREAKPAD)
if (HAVE_SPOTIFY)
install(FILES ${CMAKE_BINARY_DIR}/clementine-spotifyblob
DESTINATION "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources"
PERMISSIONS OWNER_EXECUTE OWNER_READ
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ)
endif (HAVE_SPOTIFY)
add_custom_command(TARGET clementine add_custom_command(TARGET clementine
POST_BUILD POST_BUILD
COMMAND COMMAND
${CMAKE_CURRENT_SOURCE_DIR}/../dist/macdeploy.py ${PROJECT_BINARY_DIR}/clementine.app -f ${CMAKE_CURRENT_SOURCE_DIR}/../dist/macdeploy.py ${PROJECT_BINARY_DIR}/clementine.app -f
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/..
) )
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/clementine.breakpad add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/clementine.breakpad

2
src/radio/spotifyservice.cpp
View File

@ -34,7 +34,7 @@ SpotifyService::SpotifyService(RadioModel* parent)
context_menu_(NULL), context_menu_(NULL),
search_delay_(new QTimer(this)) { search_delay_(new QTimer(this)) {
#ifdef Q_OS_DARWIN #ifdef Q_OS_DARWIN
blob_path_ = QCoreApplication::applicationDirPath() + "/../Resources/clementine-spotifyblob"; blob_path_ = QCoreApplication::applicationDirPath() + "/../PlugIns/clementine-spotifyblob";
#else #else
blob_path_ = QCoreApplication::applicationFilePath() + "-spotifyblob"; blob_path_ = QCoreApplication::applicationFilePath() + "-spotifyblob";
#endif #endif