Updated the OSX icon and removed the extraneous .app suffix

This commit is contained in:
skidau 2015-05-20 03:56:27 +00:00
parent b02d948dc1
commit cd6a2bd014
4 changed files with 8 additions and 6 deletions

View File

@ -148,11 +148,14 @@ ENDIF( WIN32 )
link_directories( ${CMAKE_BINARY_DIR} )
SET(VBAM_ICON ${CMAKE_CURRENT_SOURCE_DIR}/icons/vbam.icns)
ADD_EXECUTABLE (
wxvbam
WIN32
MACOSX_BUNDLE
${SRC_WX}
${VBAM_ICON}
)
TARGET_LINK_LIBRARIES (
@ -170,12 +173,11 @@ IF(NOT WIN32 AND NOT APPLE)
ENDIF(NOT WIN32 AND NOT APPLE)
if(APPLE)
SET(CMAKE_EXECUTABLE_SUFFIX .app)
# this should set ROM file types correctly
SET_PROPERTY(TARGET wxvbam APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/wxvbam.icns DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
SET(MACOSX_BUNDLE_ICON_FILE wxvbam.icns)
SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
# file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/vbam.icns DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
SET(MACOSX_BUNDLE_ICON_FILE vbam.icns)
SET_SOURCE_FILES_PROPERTIES(${VBAM_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif(APPLE)
SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})

BIN
src/wx/icons/vbam.icns Normal file

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@ -42,7 +42,7 @@
<key>UTTypeDescription</key>
<string>GameBoy Advance ROM</string>
<key>UTTypeIconFile</key>
<string>wxvbam.icns</string>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@ -77,7 +77,7 @@
<key>UTTypeDescription</key>
<string>GameBoy ROM</string>
<key>UTTypeIconFile</key>
<string>wxvbam.icns</string>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>