diff --git a/CMakeLists.txt b/CMakeLists.txt index f113ed76a..ef5d0257b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -730,15 +730,15 @@ if(NOT SKIP_LIBRARY) target_link_libraries(${BINARY_NAME} ${DEBUGGER_LIB} ${DEPENDENCY_LIB} ${OS_LIB}) install(TARGETS ${BINARY_NAME} LIBRARY DESTINATION ${LIBDIR} COMPONENT lib${BINARY_NAME} NAMELINK_SKIP ARCHIVE DESTINATION ${LIBDIR} RUNTIME DESTINATION ${LIBDIR} COMPONENT lib${BINARY_NAME}) if(UNIX AND NOT APPLE) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-16.png DESTINATION share/icons/hicolor/16x16/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-24.png DESTINATION share/icons/hicolor/24x24/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-32.png DESTINATION share/icons/hicolor/32x32/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-48.png DESTINATION share/icons/hicolor/48x48/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-64.png DESTINATION share/icons/hicolor/64x64/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-96.png DESTINATION share/icons/hicolor/96x96/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-128.png DESTINATION share/icons/hicolor/128x128/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-256.png DESTINATION share/icons/hicolor/256x256/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-512.png DESTINATION share/icons/hicolor/512x512/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/${BINARY_NAME}-16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/${BINARY_NAME}-24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/${BINARY_NAME}-32.png DESTINATION share/icons/hicolor/32x32/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/${BINARY_NAME}-48.png DESTINATION share/icons/hicolor/48x48/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/${BINARY_NAME}-64.png DESTINATION share/icons/hicolor/64x64/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/${BINARY_NAME}-96.png DESTINATION share/icons/hicolor/96x96/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/${BINARY_NAME}-128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/${BINARY_NAME}-256.png DESTINATION share/icons/hicolor/256x256/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/${BINARY_NAME}-512.png DESTINATION share/icons/hicolor/512x512/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) endif() else() set(BUILD_SHARED OFF) diff --git a/doc/mgba-qt.6 b/doc/medusa-qt.6 similarity index 91% rename from doc/mgba-qt.6 rename to doc/medusa-qt.6 index 10a4b7518..cb7eae23c 100644 --- a/doc/mgba-qt.6 +++ b/doc/medusa-qt.6 @@ -3,14 +3,14 @@ .\" This Source Code Form is subject to the terms of the Mozilla Public .\" License, v. 2.0. If a copy of the MPL was not distributed with this .\" file, you can obtain one at https://mozilla.org/MPL/2.0/. -.Dd July 29, 2015 -.Dt MGBA-QT 6 +.Dd April 8, 2017 +.Dt MEDUSA-QT 6 .Os .Sh NAME -.Nm mgba-qt -.Nd Game Boy Advance emulator +.Nm medusa-qt +.Nd DS emulator .Sh SYNOPSIS -.Nm mgba-qt +.Nm medusa-qt .Op Fl 123456fg .Op Fl b Ar biosfile .Op Fl l Ar loglevel @@ -19,7 +19,7 @@ .Ar file .Sh DESCRIPTION .Nm -is a Game Boy Advance emulator. +is a DS emulator. The options are as follows: .Bl -tag -width Ds .It Fl 1 @@ -115,13 +115,13 @@ is used. .El .Sh FILES .Bl -tag -width Ds -compact -.It Pa $XDG_CONFIG_HOME/mgba/config.ini +.It Pa $XDG_CONFIG_HOME/medusa/config.ini Default -.Xr mgba 6 +.Xr medusa 6 configuration file. -.It Pa $XDG_CONFIG_HOME/mgba/qt.ini +.It Pa $XDG_CONFIG_HOME/medusa/qt.ini Default -.Nm mgba-qt +.Nm medusa-qt configuration file. .It Pa portable.ini If this file exists in the current directory, @@ -131,7 +131,7 @@ will read and .Pa qt.ini from the current directory instead of -.Pa $XDG_CONFIG_HOME/mgba . +.Pa $XDG_CONFIG_HOME/medusa . .El .Sh AUTHORS .An Jeffrey Pfau Aq Mt jeffrey@endrift.com diff --git a/doc/mgba.6 b/doc/medusa.6 similarity index 96% rename from doc/mgba.6 rename to doc/medusa.6 index c5101f34d..08096bcc5 100644 --- a/doc/mgba.6 +++ b/doc/medusa.6 @@ -3,14 +3,14 @@ .\" This Source Code Form is subject to the terms of the Mozilla Public .\" License, v. 2.0. If a copy of the MPL was not distributed with this .\" file, you can obtain one at https://mozilla.org/MPL/2.0/. -.Dd July 29, 2015 -.Dt MGBA 6 +.Dd April 8, 2017 +.Dt MEDUSA 6 .Os .Sh NAME -.Nm mgba -.Nd Game Boy Advance emulator +.Nm medusa +.Nd DS emulator .Sh SYNOPSIS -.Nm mgba +.Nm medusa .Op Fl 123456dfg .Op Fl b Ar biosfile .Op Fl c Ar cheatfile @@ -21,7 +21,7 @@ .Ar file .Sh DESCRIPTION .Nm -is a Game Boy Advance emulator. +is a DS emulator. The options are as follows: .Bl -tag -width Ds .It Fl 1 @@ -242,9 +242,9 @@ is used. .El .Sh FILES .Bl -tag -width Ds -compact -.It Pa $XDG_CONFIG_HOME/mgba/config.ini +.It Pa $XDG_CONFIG_HOME/medusa/config.ini Default -.Xr mgba 6 +.Xr medusa 6 configuration file. .It Pa portable.ini If this file exists in the current directory, @@ -252,7 +252,7 @@ If this file exists in the current directory, will read .Pa config.ini from the current directory instead of -.Pa $XDG_CONFIG_HOME/mgba . +.Pa $XDG_CONFIG_HOME/medusa . .El .Sh AUTHORS .An Jeffrey Pfau Aq Mt jeffrey@endrift.com diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 97691ad6e..9ef12efd7 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -252,7 +252,7 @@ install(TARGETS ${BINARY_NAME}-qt if(UNIX AND NOT APPLE) find_program(DESKTOP_FILE_INSTALL desktop-file-install) if(DESKTOP_FILE_INSTALL) - install(CODE "execute_process(COMMAND ${DESKTOP_FILE_INSTALL} \"${CMAKE_SOURCE_DIR}/res/mgba-qt.desktop\" --dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/applications/\")") + install(CODE "execute_process(COMMAND ${DESKTOP_FILE_INSTALL} \"${CMAKE_SOURCE_DIR}/res/${BINARY_NAME}-qt.desktop\" --dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/applications/\")") endif() endif() if(UNIX)