Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-18 12:28:31 +01:00
Code Issues Releases Wiki Activity

ProjectM on mac deployment fixes.

Browse Source
This commit is contained in:
John Maguire 2010-06-07 11:38:43 +00:00
parent 48521823e3
commit d34283a113
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdparty/libprojectm/CMakeLists.txt vendored
View File

@ -165,9 +165,10 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_SOUR
FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga") FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
if (APPLE) if (APPLE)
foreach (preset ${presets}) foreach (preset ${presets})
get_filename_component(PRESET_NAME ${preset} NAME)
configure_file( configure_file(
"${preset}" "${preset}"
"${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources/projectm-presets/" "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources/projectm-presets/${PRESET_NAME}"
COPY_ONLY COPY_ONLY
) )
endforeach (preset) endforeach (preset)

2
src/core/mac_startup.mm
View File

@ -155,7 +155,7 @@ void CheckForUpdates() {
QString GetBundlePath() { QString GetBundlePath() {
CFURLRef app_url = CFBundleCopyBundleURL(CFBundleGetMainBundle()); CFURLRef app_url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
CFStringRef mac_path = CFURLCopyFileSystemPath(app_url, kCFURLPOSIXPathStyle); CFStringRef mac_path = CFURLCopyFileSystemPath(app_url, kCFURLPOSIXPathStyle);
const char* path = CFStringGetCStringPtr(mac_path, kCFStringEncodingUTF8); const char* path = CFStringGetCStringPtr(mac_path, CFStringGetSystemEncoding());
QString bundle_path = QString::fromUtf8(path); QString bundle_path = QString::fromUtf8(path);
CFRelease(app_url); CFRelease(app_url);
CFRelease(mac_path); CFRelease(mac_path);