Explorar o código

- (linux) launcher will be available in OS start menu/launchers as
"VCMI" and client will be present as "VCMI Client"

Ivan Savenko %!s(int64=12) %!d(string=hai) anos
pai
achega
2b6cdd5f41
Modificáronse 3 ficheiros con 16 adicións e 3 borrados
  1. 6 2
      CMakeLists.txt
  2. 1 1
      client/icons/vcmiclient.desktop
  3. 9 0
      launcher/vcmilauncher.desktop

+ 6 - 2
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()
 
 #######################################

+ 1 - 1
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

+ 9 - 0
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