Updated the OSX icon and removed the extraneous .app suffix
This commit is contained in:
parent
b02d948dc1
commit
cd6a2bd014
|
@ -148,11 +148,14 @@ ENDIF( WIN32 )
|
||||||
|
|
||||||
link_directories( ${CMAKE_BINARY_DIR} )
|
link_directories( ${CMAKE_BINARY_DIR} )
|
||||||
|
|
||||||
|
SET(VBAM_ICON ${CMAKE_CURRENT_SOURCE_DIR}/icons/vbam.icns)
|
||||||
|
|
||||||
ADD_EXECUTABLE (
|
ADD_EXECUTABLE (
|
||||||
wxvbam
|
wxvbam
|
||||||
WIN32
|
WIN32
|
||||||
MACOSX_BUNDLE
|
MACOSX_BUNDLE
|
||||||
${SRC_WX}
|
${SRC_WX}
|
||||||
|
${VBAM_ICON}
|
||||||
)
|
)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES (
|
TARGET_LINK_LIBRARIES (
|
||||||
|
@ -170,12 +173,11 @@ IF(NOT WIN32 AND NOT APPLE)
|
||||||
ENDIF(NOT WIN32 AND NOT APPLE)
|
ENDIF(NOT WIN32 AND NOT APPLE)
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
SET(CMAKE_EXECUTABLE_SUFFIX .app)
|
|
||||||
# this should set ROM file types correctly
|
# this should set ROM file types correctly
|
||||||
SET_PROPERTY(TARGET wxvbam APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
|
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})
|
# file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/vbam.icns DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
SET(MACOSX_BUNDLE_ICON_FILE wxvbam.icns)
|
SET(MACOSX_BUNDLE_ICON_FILE vbam.icns)
|
||||||
SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
|
SET_SOURCE_FILES_PROPERTIES(${VBAM_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
|
||||||
endif(APPLE)
|
endif(APPLE)
|
||||||
|
|
||||||
SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
|
SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Before Width: | Height: | Size: 17 KiB |
|
@ -42,7 +42,7 @@
|
||||||
<key>UTTypeDescription</key>
|
<key>UTTypeDescription</key>
|
||||||
<string>GameBoy Advance ROM</string>
|
<string>GameBoy Advance ROM</string>
|
||||||
<key>UTTypeIconFile</key>
|
<key>UTTypeIconFile</key>
|
||||||
<string>wxvbam.icns</string>
|
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
|
||||||
<key>UTTypeConformsTo</key>
|
<key>UTTypeConformsTo</key>
|
||||||
<array>
|
<array>
|
||||||
<string>public.data</string>
|
<string>public.data</string>
|
||||||
|
@ -77,7 +77,7 @@
|
||||||
<key>UTTypeDescription</key>
|
<key>UTTypeDescription</key>
|
||||||
<string>GameBoy ROM</string>
|
<string>GameBoy ROM</string>
|
||||||
<key>UTTypeIconFile</key>
|
<key>UTTypeIconFile</key>
|
||||||
<string>wxvbam.icns</string>
|
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
|
||||||
<key>UTTypeConformsTo</key>
|
<key>UTTypeConformsTo</key>
|
||||||
<array>
|
<array>
|
||||||
<string>public.data</string>
|
<string>public.data</string>
|
||||||
|
|
Loading…
Reference in New Issue