From 24947d800ace7f183aa18543ee2616352402d4c8 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Sun, 26 Jun 2011 20:55:21 +0400
Subject: [PATCH] Fixed launcher config and style location. Launcher will be
 started when opening bundle

---
 apps/launcher/CMakeLists.txt | 17 ++++++++++++-----
 files/mac/Info.plist         |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index d7e5b3a778..5090c167d4 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -65,8 +65,15 @@ target_link_libraries(omwlauncher
     ${PNG_LIBRARY}
 )
 
-configure_file(${CMAKE_SOURCE_DIR}/files/launcher.qss
-    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launcher.qss")
-
-configure_file(${CMAKE_SOURCE_DIR}/files/launcher.cfg
-    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launcher.cfg")
+if (APPLE)
+    configure_file(${CMAKE_SOURCE_DIR}/files/launcher.qss
+        "${APP_BUNDLE_DIR}/../launcher.qss")
+    configure_file(${CMAKE_SOURCE_DIR}/files/launcher.qss
+        "${APP_BUNDLE_DIR}/../launcher.cfg")
+else()
+    configure_file(${CMAKE_SOURCE_DIR}/files/launcher.qss
+        "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launcher.qss")
+        
+    configure_file(${CMAKE_SOURCE_DIR}/files/launcher.cfg
+        "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launcher.cfg")
+endif()
diff --git a/files/mac/Info.plist b/files/mac/Info.plist
index 6b350d2501..1872425e7c 100644
--- a/files/mac/Info.plist
+++ b/files/mac/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>openmw</string>
+	<string>omwlauncher</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>