From d34283a11363c039d5d4f9915f9e6bc95f3b9657 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Mon, 7 Jun 2010 11:38:43 +0000
Subject: [PATCH] ProjectM on mac deployment fixes.

---
 3rdparty/libprojectm/CMakeLists.txt | 3 ++-
 src/core/mac_startup.mm             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt
index f3c36de39..b8f6f7ca7 100644
--- a/3rdparty/libprojectm/CMakeLists.txt
+++ b/3rdparty/libprojectm/CMakeLists.txt
@@ -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")
 if (APPLE)
   foreach (preset ${presets})
+    get_filename_component(PRESET_NAME ${preset} NAME)
     configure_file(
       "${preset}"
-      "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources/projectm-presets/"
+      "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources/projectm-presets/${PRESET_NAME}"
       COPY_ONLY
     )
   endforeach (preset)
diff --git a/src/core/mac_startup.mm b/src/core/mac_startup.mm
index 39c4fbf79..31fc0cb03 100644
--- a/src/core/mac_startup.mm
+++ b/src/core/mac_startup.mm
@@ -155,7 +155,7 @@ void CheckForUpdates() {
 QString GetBundlePath() {
   CFURLRef app_url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
   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);
   CFRelease(app_url);
   CFRelease(mac_path);