diff --git a/assets/yaze.icns b/assets/yaze.icns new file mode 100644 index 00000000..3005e6dc Binary files /dev/null and b/assets/yaze.icns differ diff --git a/cmake/absl.cmake b/cmake/absl.cmake index 2bb4b25d..2b663f6e 100644 --- a/cmake/absl.cmake +++ b/cmake/absl.cmake @@ -39,7 +39,6 @@ set( absl::demangle_internal absl::strings_internal absl::city - absl::cordz_functions absl::malloc_internal absl::graphcycles_internal absl::str_format_internal diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aad1449c..3ed860a7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -79,11 +79,6 @@ if (YAZE_BUILD_Z3ED) endif() if(MACOS) - set(MACOSX_BUNDLE_ICON_FILE ${CMAKE_SOURCE_DIR}/win32/yaze.ico) - set(MACOSX_BUNDLE_BUNDLE_NAME "yaze") - set(MACOSX_BUNDLE_EXECUTABLE_NAME "yaze") - set(MACOSX_BUNDLE_GUI_IDENTIFIER "yaze") - set(MACOSX_BUNDLE_INFO_STRING "yaze") set_target_properties(yaze PROPERTIES BUNDLE True diff --git a/src/app/app.cmake b/src/app/app.cmake index 9a873ac1..8d989b34 100644 --- a/src/app/app.cmake +++ b/src/app/app.cmake @@ -21,6 +21,24 @@ if (APPLE) # Bundled Resources ${YAZE_RESOURCE_FILES} ) + + # Add the app icon to the macOS bundle + set(ICON_FILE "${CMAKE_SOURCE_DIR}/assets/yaze.icns") + target_sources(yaze PRIVATE ${ICON_FILE}) + set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + + # Set macOS bundle properties + set_target_properties(yaze PROPERTIES + MACOSX_BUNDLE_ICON_FILE "yaze.icns" + MACOSX_BUNDLE_BUNDLE_NAME "Yaze" + MACOSX_BUNDLE_EXECUTABLE_NAME "yaze" + MACOSX_BUNDLE_GUI_IDENTIFIER "com.scawful.yaze" + MACOSX_BUNDLE_INFO_STRING "Yet Another Zelda3 Editor" + MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}" + MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}" + MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}" + MACOSX_BUNDLE_COPYRIGHT "Copyright © 2024 scawful. All rights reserved." + ) else() add_executable( yaze