Linux: Added app launcher shortcuts for the client and Shell

IssueID #2092
skyjake · Oct 19, 2016 · 57f1ab3 · 57f1ab3
1 parent 64a3b14
commit 57f1ab3
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 19 deletions.
diff --git a/distrib/linux/doomsday-shell.desktop b/distrib/linux/doomsday-shell.desktop
diff --git a/distrib/linux/launch-doomsday b/distrib/linux/launch-doomsday
diff --git a/doomsday/apps/client/CMakeLists.txt b/doomsday/apps/client/CMakeLists.txt
@@ -137,6 +137,14 @@ else ()
     set_property (TARGET client PROPERTY OUTPUT_NAME "doomsday")
 endif ()
 
+if (UNIX AND NOT APPLE)
+    configure_file (doomsday-engine.desktop.in net.dengine.Doomsday.desktop)
+    install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/net.dengine.Doomsday.desktop
+        DESTINATION share/applications)
+    install (FILES res/linux/deng-logo-256.png
+        DESTINATION ${DENG_INSTALL_DATA_DIR})
+endif ()
+
 if (WIN32)
     # WIX generator requires setting this manually.
     set_property (INSTALL "bin/$<TARGET_FILE_NAME:client>"

diff --git a/distrib/linux/doomsday-engine.desktop → ...ay/apps/client/doomsday-engine.desktop.in b/distrib/linux/doomsday-engine.desktop → ...ay/apps/client/doomsday-engine.desktop.in
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Doomsday Engine
+Name=Doomsday 2
 Comment=Doom/Heretic/Hexen with enhanced graphics
 Categories=Game;ActionGame;
-Exec=BIN_DIR/launch-doomsday
+Exec=${CMAKE_INSTALL_PREFIX}/bin/doomsday
 Terminal=false
 Type=Application
-Icon=SB_DIR/graphics/snowberry.png
+Icon=${CMAKE_INSTALL_PREFIX}/${DENG_INSTALL_DATA_DIR}/deng-logo-256.png
 
diff --git a/doomsday/apps/client/res/linux/deng-logo-256.png b/doomsday/apps/client/res/linux/deng-logo-256.png
diff --git a/doomsday/tools/shell/CMakeLists.txt b/doomsday/tools/shell/CMakeLists.txt
@@ -44,6 +44,14 @@ deng_install_bundle_deps (shell Deng::libcore Deng::libshell)
 deng_install_deployqt (shell)
 deng_codesign (shell)
 
+if (UNIX AND NOT APPLE)
+    configure_file (doomsday-shell.desktop.in net.dengine.Shell.desktop)
+    install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/net.dengine.Shell.desktop
+        DESTINATION share/applications)
+    install (FILES res/linux/deng-shell-logo-256.png
+        DESTINATION ${DENG_INSTALL_DATA_DIR})
+endif ()
+
 if (WIN32)
     # WIX generator requires setting this manually.
     set_property (INSTALL "bin/$<TARGET_FILE_NAME:shell>"

diff --git a/doomsday/tools/shell/doomsday-shell.desktop.in b/doomsday/tools/shell/doomsday-shell.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Doomsday Shell
+Comment=Shell for controlling Doomsday Engine servers
+Categories=Game;ActionGame;
+Exec=${CMAKE_INSTALL_PREFIX}/bin/doomsday-shell
+Terminal=false
+Type=Application
+Icon=${CMAKE_INSTALL_PREFIX}/${DENG_INSTALL_DATA_DIR}/deng-shell-logo-256.png
+
diff --git a/doomsday/tools/shell/res/linux/deng-shell-logo-256.png b/doomsday/tools/shell/res/linux/deng-shell-logo-256.png