# HG changeset patch
# User koda
# Date 1388073106 -3600
# Node ID 85ce4dc3de8a0341d366574817bc1abab4ce1b94
# Parent  c49b2daced22cc7150d081d31579f4153143c7ce# Parent  b1e4f0dddfb5f466e152575724c18006316b40c4
merge a few changes from 0.9.20

diff -r c49b2daced22 -r 85ce4dc3de8a tools/CreateMacBundle.cmake.in
--- a/tools/CreateMacBundle.cmake.in	Thu Dec 26 16:51:11 2013 +0100
+++ b/tools/CreateMacBundle.cmake.in	Thu Dec 26 16:51:46 2013 +0100
@@ -19,16 +19,18 @@
 endif()
 
 if(doBundle EQUAL 1)
-    execute_process(COMMAND cp -pPR ${sdl_library_only} ${frameworks_dir}/SDL.framework)
-    execute_process(COMMAND cp -pPR ${SDLIMAGE_LIBRARY} ${frameworks_dir}/SDL_image.framework)
-    execute_process(COMMAND cp -pPR ${SDLNET_LIBRARY}   ${frameworks_dir}/SDL_net.framework)
-    execute_process(COMMAND cp -pPR ${SDLTTF_LIBRARY}   ${frameworks_dir}/SDL_ttf.framework)
-    execute_process(COMMAND cp -pPR ${SDLMIXER_LIBRARY} ${frameworks_dir}/SDL_mixer.framework)
-    execute_process(COMMAND cp -pPR ${OGG_LIBRARY}      ${frameworks_dir}/Ogg.framework)
-    execute_process(COMMAND cp -pPR ${VORBIS_LIBRARY}   ${frameworks_dir}/Vorbis.framework)
+    execute_process(COMMAND cp ${PNG_LIBRARY} ${frameworks_dir})
+
+    execute_process(COMMAND cp -pPR ${sdl_library_only} ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDLIMAGE_LIBRARY} ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDLNET_LIBRARY}   ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDLTTF_LIBRARY}   ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDLMIXER_LIBRARY} ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${OGG_LIBRARY}      ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${VORBIS_LIBRARY}   ${frameworks_dir})
 
     if(${SPARKLE_FOUND})
-        execute_process(COMMAND cp -pPR ${SPARKLE_LIBRARY} ${frameworks_dir}/Sparkle.framework)
+        execute_process(COMMAND cp -pPR ${SPARKLE_LIBRARY} ${frameworks_dir})
     endif()
     message(STATUS "Frameworks and libraries successfully copied...")
 else()