ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix gtk ui installation on windows/apple 

Also removed an unneeded if/else statement
This commit is contained in:
Arthur Moore 2015-01-07 18:57:35 -05:00
parent 177607f426
commit 4ae8dd942a
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/CMakeLists.txt
View File

@ -59,19 +59,16 @@ TARGET_LINK_LIBRARIES (
)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gvbam DESTINATION bin)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ui DESTINATION ${DATA_INSTALL_DIR})
IF(NOT WIN32 AND NOT APPLE)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gvbam.desktop DESTINATION share/applications)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ui DESTINATION ${DATA_INSTALL_DIR})
ENDIF(NOT WIN32 AND NOT APPLE)
if(WIN32)
SET(GTK_EXE_NAME gvbam${CMAKE_EXECUTABLE_SUFFIX})
else(WIN32)
if(APPLE)
SET(GTK_EXE_NAME gvbam.app)
#Probably don't need this
SET(CMAKE_EXECUTABLE_SUFFIX .app)
# this should set ROM file types correctly
SET_PROPERTY(TARGET gvbam APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
else(APPLE)
SET(GTK_EXE_NAME gvbam${CMAKE_EXECUTABLE_SUFFIX})
SET_PROPERTY(TARGET wxvbam APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
endif(APPLE)
endif(WIN32)
SET(WX_EXE_NAME gvbam${CMAKE_EXECUTABLE_SUFFIX})

11
src/wx/CMakeLists.txt
View File

@ -176,18 +176,15 @@ IF(NOT WIN32 AND NOT APPLE)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION share/applications)
ENDIF(NOT WIN32 AND NOT APPLE)
if(WIN32)
SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
else(WIN32)
if(APPLE)
SET(WX_EXE_NAME wxvbam.app)
#Probably don't need this
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)
#Handle the program icon
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../art/wxvbam.icns DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
SET(MACOSX_BUNDLE_ICON_FILE wxvbam.icns)
SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
else(APPLE)
SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
endif(APPLE)
endif(WIN32)
SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})