1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 038a34ba..d46b9258 100644
5 @@ -669,16 +669,14 @@ endif()
7 # generating a macOS icns file (see https://stackoverflow.com/a/20703594)
8 add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/res/julius.icns
9 - COMMAND mkdir -p julius.iconset
10 - COMMAND sips -z 16 16 julius_256.png --out julius.iconset/icon_16x16.png
11 - COMMAND sips -z 32 32 julius_256.png --out julius.iconset/icon_16x16@2x.png
12 - COMMAND sips -z 32 32 julius_256.png --out julius.iconset/icon_32x32.png
13 - COMMAND sips -z 64 64 julius_256.png --out julius.iconset/icon_32x32@2x.png
14 - COMMAND sips -z 128 128 julius_256.png --out julius.iconset/icon_128x128.png
15 - COMMAND sips -z 256 256 julius_256.png --out julius.iconset/icon_128x128@2x.png
16 - COMMAND sips -z 256 256 julius_256.png --out julius.iconset/icon_256x256.png
17 - COMMAND sips -z 512 512 julius_512.png --out julius.iconset/icon_256x256@2x.png
18 - COMMAND iconutil -c icns julius.iconset
19 + COMMAND mkdir julius.iconset
20 + COMMAND convert julius_256.png -resize 16x16 julius.iconset/icon_16.png
21 + COMMAND convert julius_256.png -resize 32x32 julius.iconset/icon_32.png
22 + COMMAND convert julius_256.png -resize 64x64 julius.iconset/icon_64.png
23 + COMMAND convert julius_256.png -resize 128x128 julius.iconset/icon_128.png
24 + COMMAND cp julius_256.png julius.iconset/icon_256.png
25 + COMMAND cp julius_512.png julius.iconset/icon_512.png
26 + COMMAND png2icns julius.icns julius.iconset/icon_{16,32,64,128,256,512}.png
27 COMMAND rm -R julius.iconset
28 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/res)
29 set_source_files_properties(${PROJECT_SOURCE_DIR}/res/julius.icns PROPERTIES
30 @@ -687,7 +685,6 @@ if(APPLE)
31 # setting variables that will populate Info.plist
32 set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.github.bvschaik.julius")
33 set(MACOSX_BUNDLE_BUNDLE_NAME ${USER_FRIENDLY_NAME})
34 - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "Minimum OS X deployment version" FORCE)
35 set(MACOSX_BUNDLE_ICON_FILE "julius.icns")
36 set(MACOSX_BUNDLE_BUNDLE_VERSION
37 "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${VERSION_REVISION}")
38 diff --git a/cmake/FindSDL2_mixer.cmake b/cmake/FindSDL2_mixer.cmake
39 index 29cc683c..1fa28a1f 100644
40 --- a/cmake/FindSDL2_mixer.cmake
41 +++ b/cmake/FindSDL2_mixer.cmake
42 @@ -93,7 +93,6 @@ ELSE()
43 PATH_SUFFIXES include include/SDL2
44 PATHS ${SDL2_SEARCH_PATHS}
46 - set(SDL2_MIXER_INCLUDE_DIR "${SDL2_MIXER_INCLUDE_DIR}/Headers")
49 if(NOT APPLE OR NOT EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")