# HG changeset patch
# User koda
# Date 1458449864 14400
# Node ID b77870abb3c4540dc7ea29274f7805ced5f5061d
# Parent  ed70d59479d75d0a3de668e5fb01b1ccf0b6f697
Update osx bundle creation with SDL2 library names

diff -r ed70d59479d7 -r b77870abb3c4 tools/CMakeLists.txt
--- a/tools/CMakeLists.txt	Fri Mar 18 13:27:30 2016 -0400
+++ b/tools/CMakeLists.txt	Sun Mar 20 00:57:44 2016 -0400
@@ -29,9 +29,9 @@
     #use the associated tool from the libraries we've selected
     string(REGEX REPLACE "(.*)/include.*" "\\1" qt_base_dir "${QT_INCLUDE_DIR}")
 
-    #remove the ";-framework Cocoa" from the SDL_LIBRARY variable
-    string(REGEX REPLACE "(.*);-.*" "\\1" sdl_library_only "${SDL_LIBRARY}")
-    #remove the "libSDLmain.a" from the SDL_LIBRARY variable
+    #remove the ";-framework Cocoa" from the SDL2_LIBRARY variable
+    string(REGEX REPLACE "(.*);-.*" "\\1" sdl_library_only "${SDL2_LIBRARY}")
+    #remove the "libSDLmain.a" from the SDL2_LIBRARY variable
     string(REGEX REPLACE ".*;(.*)" "\\1" sdl_library_only "${sdl_library_only}")
 
     #get the neme of the library (harmelss if it is static)
diff -r ed70d59479d7 -r b77870abb3c4 tools/CreateMacBundle.cmake.in
--- a/tools/CreateMacBundle.cmake.in	Fri Mar 18 13:27:30 2016 -0400
+++ b/tools/CreateMacBundle.cmake.in	Sun Mar 20 00:57:44 2016 -0400
@@ -21,13 +21,13 @@
 if(doBundle EQUAL 1)
     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})
+    execute_process(COMMAND cp -pPR ${sdl_library_only}  ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDL2IMAGE_LIBRARY} ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDL2NET_LIBRARY}   ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDL2TTF_LIBRARY}   ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDL2MIXER_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})