From 2b6cdd5f4139011d3ce399c97cde9f56140f5ebf Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sat, 16 Nov 2013 18:13:30 +0000 Subject: [PATCH] - (linux) launcher will be available in OS start menu/launchers as "VCMI" and client will be present as "VCMI Client" --- CMakeLists.txt | 8 ++++++-- client/icons/vcmiclient.desktop | 2 +- launcher/vcmilauncher.desktop | 9 +++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 launcher/vcmilauncher.desktop diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d68f5480..804bb5e80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ endif() if(ENABLE_TEST) # find_package overwrites BOOST_* variables which are already set, so all components have to be # included again - find_package(Boost 1.46.0 COMPONENTS program_options filesystem system thread locale unit_test_framework REQUIRED) + find_package(Boost 1.48.0 COMPONENTS program_options filesystem system thread locale unit_test_framework REQUIRED) endif() if(NOT WIN32) @@ -80,7 +80,7 @@ if(NOT WIN32) INCLUDE(CheckLibraryExists) - #check if some platform-specific libraries are needed for linking client and server + #check if some platform-specific libraries are needed for linking CHECK_LIBRARY_EXISTS(rt shm_open "" HAVE_RT_LIB) if(HAVE_RT_LIB) set(RT_LIB -lrt) @@ -181,11 +181,15 @@ if(WIN32) elseif(APPLE) else() #install icons and desktop file on Linux + #FIXME: move to client makefile? install(FILES "${CMAKE_SOURCE_DIR}/client/icons/vcmiclient.64x64.png" DESTINATION share/icons/hicolor/64x64/apps RENAME vcmiclient.png) install(FILES "${CMAKE_SOURCE_DIR}/client/icons/vcmiclient.48x48.png" DESTINATION share/icons/hicolor/48x48/apps RENAME vcmiclient.png) install(FILES "${CMAKE_SOURCE_DIR}/client/icons/vcmiclient.32x32.png" DESTINATION share/icons/hicolor/32x32/apps RENAME vcmiclient.png) install(FILES "${CMAKE_SOURCE_DIR}/client/icons/vcmiclient.256x256.png" DESTINATION share/icons/hicolor/256x256/apps RENAME vcmiclient.png) install(FILES "${CMAKE_SOURCE_DIR}/client/icons/vcmiclient.desktop" DESTINATION share/applications) + if (ENABLE_LAUNCHER) #FIXME: move to launcher makefile? + install(FILES "${CMAKE_SOURCE_DIR}/launcher/vcmilauncher.desktop" DESTINATION share/applications) + endif() endif() ####################################### diff --git a/client/icons/vcmiclient.desktop b/client/icons/vcmiclient.desktop index 0c47d546d..a68269d23 100644 --- a/client/icons/vcmiclient.desktop +++ b/client/icons/vcmiclient.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Name=VCMI +Name=VCMI Client GenericName=Strategy Game Engine Comment=Open engine for Heroes of Might and Magic 3 Icon=vcmiclient diff --git a/launcher/vcmilauncher.desktop b/launcher/vcmilauncher.desktop new file mode 100644 index 000000000..ae0a4f993 --- /dev/null +++ b/launcher/vcmilauncher.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=VCMI +GenericName=Strategy Game Engine +Comment=Launcher for open engine of Heroes of Might and Magic 3 +Icon=vcmiclient +Exec=vcmilauncher +Categories=Game;StrategyGame; +Version=1.0