diff options
| -rw-r--r-- | dist/eglantine.icns | bin | 0 -> 620877 bytes | |||
| -rw-r--r-- | src/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/yuzu/Info.plist | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/dist/eglantine.icns b/dist/eglantine.icns Binary files differnew file mode 100644 index 0000000000..812334cd28 --- /dev/null +++ b/dist/eglantine.icns diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index d3e7b03cd2..76c5019788 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -152,7 +152,7 @@ add_library( set_source_files_properties(zbic_compression.cpp PROPERTIES INCLUDE_DIRECTORIES "${ZBIC_INCLUDE_DIR}" - COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:Clang,GNU>:-Wno-unused-function;-Wno-missing-declarations;-Wno-shadow>;$<$<CXX_COMPILER_ID:MSVC>:/wd4505;/wd5245>") + COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:AppleClang,Clang,GNU>:-Wno-unused-function;-Wno-missing-declarations;-Wno-shadow>;$<$<CXX_COMPILER_ID:MSVC>:/wd4505;/wd5245>") if(WIN32) target_sources(common PRIVATE windows/timer_resolution.cpp diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index c9be4ff901..40ff1d45f9 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -373,7 +373,7 @@ if (APPLE) XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED ON) # Otherwise, we'll use our own. else() - set(_icons "${_dist}/eden.icns" "${_dist}/Assets.car") + set(_icons "${_dist}/eglantine.icns" "${_dist}/Assets.car") endif() set_source_files_properties(${_icons} PROPERTIES diff --git a/src/yuzu/Info.plist b/src/yuzu/Info.plist index 5c24f27f72..9b6d49b87a 100644 --- a/src/yuzu/Info.plist +++ b/src/yuzu/Info.plist @@ -17,7 +17,7 @@ SPDX-License-Identifier: GPL-2.0-or-later <key>CFBundleGetInfoString</key> <string></string> <key>CFBundleIconFile</key> - <string>eden.icns</string> + <string>eglantine.icns</string> <key>CFBundleIconName</key> <string>eglantine</string> <key>CFBundleIdentifier</key> |