From c5e0e48d98e1fd483a00121b5bafdab89aed49b7 Mon Sep 17 00:00:00 2001
From: stopiccot <alexey.petruchik@gmail.com>
Date: Fri, 13 Dec 2013 11:51:15 +0000
Subject: [PATCH] Some OS X related fixes

---
 CMakeLists.txt        |  4 ++++
 client/CMakeLists.txt | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 804bb5e80..d5d45e4ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,10 @@ if(ENABLE_TEST)
         find_package(Boost 1.48.0 COMPONENTS program_options filesystem system thread locale unit_test_framework REQUIRED)
 endif()
 
+if(APPLE)
+	set(Boost_LIBRARIES ${Boost_LIBRARIES} libiconv.dylib) # Our prebuilt boost_locale for OS X depends on iconv
+endif()
+
 if(NOT WIN32)
 	set(FFmpeg_FIND_COMPONENTS AVFORMAT SWSCALE)
 	find_package(FFmpeg REQUIRED)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index f578d7295..206938fb7 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -90,14 +90,16 @@ elseif(APPLE)
         cp -r ${CMAKE_HOME_DIRECTORY}/osx/vcmibuilder.app ${BUNDLE_PATH}/MacOS/vcmibuilder.app &&
 
         # Copy frameworks
-        cp -r ${CMAKE_HOME_DIRECTORY}/${CMAKE_FRAMEWORK_PATH} ${BUNDLE_PATH}/Frameworks &&
+        cp -r ${CMAKE_HOME_DIRECTORY}/${CMAKE_FRAMEWORK_PATH} ${BUNDLE_PATH}/Frameworks/ &&
 
         # Copy vcmi data
         mkdir -p ${BUNDLE_PATH}/Data &&
         mkdir -p ${BUNDLE_PATH}/Data/Mods &&
-        cp -r ${CMAKE_HOME_DIRECTORY}/config ${BUNDLE_PATH}/Data/config &&
-        cp -r ${CMAKE_HOME_DIRECTORY}/Mods/vcmi ${BUNDLE_PATH}/Data/Mods/vcmi &&
-        cp -r ${CMAKE_HOME_DIRECTORY}/Mods/WoG ${BUNDLE_PATH}/Data/Mods/WoG)
+        mkdir -p ${BUNDLE_PATH}/Data/launcher &&
+        cp -r ${CMAKE_HOME_DIRECTORY}/config/ ${BUNDLE_PATH}/Data/config/ &&
+        cp -r ${CMAKE_HOME_DIRECTORY}/Mods/vcmi/ ${BUNDLE_PATH}/Data/Mods/vcmi/ &&
+        cp -r ${CMAKE_HOME_DIRECTORY}/Mods/WoG/ ${BUNDLE_PATH}/Data/Mods/WoG/ &&
+        cp -r ${CMAKE_HOME_DIRECTORY}/launcher/icons/ ${BUNDLE_PATH}/Data/launcher/icons/)
         
     add_custom_command(TARGET vcmiclient POST_BUILD COMMAND ${MakeVCMIBundle})
 else()