From 0cad9441184ff1ec50ba25753ff022506c8e1efc Mon Sep 17 00:00:00 2001
From: filux <smartadminpl@gmail.com>
Date: Mon, 14 Dec 2015 23:16:54 +0100
Subject: [PATCH] implemented appdata 2/2

---
 CMakeLists.txt                                |   56 +-
 data/glest_game                               |    2 +-
 mk/linux/make-binary-archive.sh               |    7 +-
 mk/linux/megaglest.bmp                        |  Bin 4150 -> 0 bytes
 mk/linux/megaglest.desktop                    |   10 -
 mk/linux/megaglest.png                        |  Bin 4581 -> 0 bytes
 mk/linux/megaglest.xpm                        | 1007 -----------------
 mk/linux/megaglest_editor.desktop             |   10 -
 mk/linux/megaglest_g3dviewer.desktop          |   10 -
 .../installer/make.sh                         |    1 +
 .../installer}/megaglest-uninstall.ico        |  Bin
 source/g3d_viewer/CMakeLists.txt              |   16 -
 source/glest_game/CMakeLists.txt              |   34 +-
 source/glest_map_editor/CMakeLists.txt        |   16 -
 14 files changed, 28 insertions(+), 1141 deletions(-)
 delete mode 100644 mk/linux/megaglest.bmp
 delete mode 100644 mk/linux/megaglest.desktop
 delete mode 100644 mk/linux/megaglest.png
 delete mode 100644 mk/linux/megaglest.xpm
 delete mode 100644 mk/linux/megaglest_editor.desktop
 delete mode 100644 mk/linux/megaglest_g3dviewer.desktop
 rename mk/linux/{ => tools-for-standalone-client/installer}/megaglest-uninstall.ico (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f86f5f149..b673741e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -406,61 +406,39 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
         MESSAGE(WARNING ">> CLANG is NOT currently compatible as it does not support the following essential GCC compiler settings: -frounding-math -fsignaling-nans")
 ENDIF()
 
+IF(NOT DEFINED CPACK_GENERATOR)
+	SET(CPACK_GENERATOR "DEB")
+ENDIF()
 # CPack configuration shared accross platforms
 SET(CPACK_PACKAGE_NAME ${PKG_NAME})
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MegaGlest")
+IF(EXISTS "${PROJECT_SOURCE_DIR}/data/glest_game/others/megaglest-long-description.txt.in")
+	FILE(READ "${PROJECT_SOURCE_DIR}/data/glest_game/others/megaglest-long-description.txt.in" MEGAGLEST_LONG_DESCRIPTION)
+	SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${MEGAGLEST_LONG_DESCRIPTION}")
+ELSE()
+	SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MegaGlest")
+ENDIF()
 SET(CPACK_PACKAGE_VENDOR "megaglest.org")
 #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "megaglest")
+SET(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 SET(CPACK_PACKAGE_VERSION "${MEGAGLEST_VERSION}")
 SET(CPACK_PACKAGE_VERSION_MAJOR "${VER_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${VER_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${VER_PATCH}")
 
-
-# Debian specific generator options
-IF(NOT DEFINED CPACK_GENERATOR)
-	SET(CPACK_GENERATOR "DEB")
+IF("${CPACK_GENERATOR}" STREQUAL "DEB")
 	SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Mark Vejvoda") #required
-	SET(CPACK_DEBIAN_PACKAGE_DEPENDS "
-	 libcurl4-gnutls-dev | libcurl4-nss-dev,
-	 libfontconfig1-dev,
-	 libftgl-dev,
-	 libglew-dev,
-	 libircclient-dev,
-	 libjpeg-dev,
-	 liblua5.1-0-dev,
-	 libminiupnpc-dev,
-	 libogg-dev,
-	 libopenal-dev,
-	 libpng12-dev,
-	 libsdl1.2-dev,
-	 libvlc-dev,
-	 libvorbis-dev,
-	 libwxgtk2.9-dev,
-	 libxerces-c2-dev,
-	 libxml2-dev,
-	 libz-dev,
-	 libfribidi-dev")
-	# FIXME ^ cpack configuration should be fixed and tested
-
-	#find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
-	#if(DPKG_PROGRAM)
-	#  execute_process(
-	#    COMMAND ${DPKG_PROGRAM} --print-architecture
-	#    OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
-	#    OUTPUT_STRIP_TRAILING_WHITESPACE
-	#  )
-	#endif(DPKG_PROGRAM)
-ENDIF(NOT DEFINED CPACK_GENERATOR)
-
-IF(CPACK_GENERATOR STREQUAL "NSIS")
+	SET(CPACK_DEBIAN_PACKAGE_SECTION "games")
+	SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+	SET(CPACK_DEBIAN_PACKAGE_SUGGESTS "p7zip-full")
+ENDIF()
+IF("${CPACK_GENERATOR}" STREQUAL "NSIS")
 	SET(CPACK_NSIS_DISPLAY_NAME "MegaGlest")
 	SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/glest.ico")
 	SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/megaglest.ico")
 	SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org")
-ENDIF(CPACK_GENERATOR STREQUAL "NSIS")
+ENDIF()
 
 INCLUDE(CPack)
 
diff --git a/data/glest_game b/data/glest_game
index 4cf97b86f..c5cffd71d 160000
--- a/data/glest_game
+++ b/data/glest_game
@@ -1 +1 @@
-Subproject commit 4cf97b86fc33db7de6a7c9b2ed5635ae4b445c07
+Subproject commit c5cffd71d650321c49046dba3607b7107ca3868a
diff --git a/mk/linux/make-binary-archive.sh b/mk/linux/make-binary-archive.sh
index bd3ec39a5..071f1588a 100755
--- a/mk/linux/make-binary-archive.sh
+++ b/mk/linux/make-binary-archive.sh
@@ -25,6 +25,7 @@ architecture=`uname -m  | tr '[A-Z]' '[a-z]'`
 RELEASEDIR_ROOT="$CURRENTDIR/../../../release/"
 PROJDIR="$CURRENTDIR/"
 REPODIR="$CURRENTDIR/../../"
+REPO_DATADIR="$REPODIR/data/glest_game"
 if [ -d "$REPODIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then
     cd "$REPODIR"
     if [ "$SOURCE_BRANCH" = "" ]; then SOURCE_BRANCH="$(git branch | awk -F '* ' '/^* / {print $2}')"; fi
@@ -76,10 +77,12 @@ fi
 cd $PROJDIR
 echo "copying binaries ..."
 cp -r lib/* "$RELEASEDIR/lib"
-cp {../shared/,}*.ico {../shared/,}*.ini "$RELEASEDIR/"
+cp ../shared/*.ico {../shared/,}*.ini "$RELEASEDIR/"
 if [ -e "$RELEASEDIR/glest-dev.ini" ]; then rm -f "$RELEASEDIR/glest-dev.ini"; fi
+cd $REPO_DATADIR/others/icons
 cp *.bmp *.png *.xpm "$RELEASEDIR/"
-if [ "$1" != "--installer" ]; then cp *.desktop "$RELEASEDIR/"; fi
+if [ "$1" != "--installer" ]; then cd $REPO_DATADIR/others/desktop; cp *.desktop "$RELEASEDIR/"; fi
+cd $PROJDIR
 cp megaglest megaglest_editor megaglest_g3dviewer start_megaglest \
 	start_megaglest_mapeditor start_megaglest_g3dviewer \
 	start_megaglest_gameserver "$RELEASEDIR/"
diff --git a/mk/linux/megaglest.bmp b/mk/linux/megaglest.bmp
deleted file mode 100644
index 8961a4f12df05b200a465df59a2aaa89f8939170..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4150
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
LJ34WXpUpo2V8<Za

diff --git a/mk/linux/megaglest.desktop b/mk/linux/megaglest.desktop
deleted file mode 100644
index 5141c0683..000000000
--- a/mk/linux/megaglest.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Categories=Game;StrategyGame;
-Comment=A real time strategy game.
-Name=MegaGlest
-Icon=megaglest
-Exec=megaglest
-Terminal=false
-Type=Application
-Keywords=realtime;strategy;game;
-
diff --git a/mk/linux/megaglest.png b/mk/linux/megaglest.png
deleted file mode 100644
index ed8e8baf6feb6d5f0105adef0b2a7b4973eafa8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4581
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
P00000NkvXXu0mjf-kHNt

diff --git a/mk/linux/megaglest.xpm b/mk/linux/megaglest.xpm
deleted file mode 100644
index 0484adfa1..000000000
--- a/mk/linux/megaglest.xpm
+++ /dev/null
@@ -1,1007 +0,0 @@
-/* XPM */
-static char * megaglest_xpm[] = {
-"32 32 972 2",
-"  	c None",
-". 	c #B7AE90",
-"+ 	c #C3BA8D",
-"@ 	c #A79C7C",
-"# 	c #A89A7B",
-"$ 	c #ADA185",
-"% 	c #B3A88E",
-"& 	c #A79879",
-"* 	c #A59574",
-"= 	c #A69879",
-"- 	c #ADA287",
-"; 	c #A1916F",
-"> 	c #AB9E80",
-", 	c #B2A78D",
-"' 	c #A09375",
-") 	c #AFA286",
-"! 	c #A49473",
-"~ 	c #B1A589",
-"{ 	c #B2A78B",
-"] 	c #B2A88D",
-"^ 	c #AEA387",
-"/ 	c #A29477",
-"( 	c #AC9D80",
-"_ 	c #B5AB90",
-": 	c #AEA183",
-"< 	c #AB9D81",
-"[ 	c #A69777",
-"} 	c #A8997B",
-"| 	c #ADA082",
-"1 	c #A6997A",
-"2 	c #70603B",
-"3 	c #A69B7E",
-"4 	c #544322",
-"5 	c #6F5E28",
-"6 	c #887624",
-"7 	c #584114",
-"8 	c #776236",
-"9 	c #695A38",
-"0 	c #685530",
-"a 	c #88721A",
-"b 	c #C2AA3C",
-"c 	c #7A6428",
-"d 	c #644D16",
-"e 	c #59461C",
-"f 	c #635229",
-"g 	c #735D2D",
-"h 	c #6D5622",
-"i 	c #6B5521",
-"j 	c #655123",
-"k 	c #4D3C1D",
-"l 	c #7D693D",
-"m 	c #806B3D",
-"n 	c #5C4106",
-"o 	c #644B13",
-"p 	c #6F5E37",
-"q 	c #625438",
-"r 	c #705928",
-"s 	c #806D43",
-"t 	c #7F6B3E",
-"u 	c #5C4513",
-"v 	c #5F5133",
-"w 	c #362B13",
-"x 	c #9D9276",
-"y 	c #A07E0D",
-"z 	c #635A2B",
-"A 	c #EAE631",
-"B 	c #735E1B",
-"C 	c #73613D",
-"D 	c #62521B",
-"E 	c #6C5C29",
-"F 	c #EBB73C",
-"G 	c #FF933B",
-"H 	c #A78D48",
-"I 	c #7F693F",
-"J 	c #5E480D",
-"K 	c #6A5B28",
-"L 	c #6A5018",
-"M 	c #705823",
-"N 	c #684F19",
-"O 	c #605133",
-"P 	c #9D7F12",
-"Q 	c #7A6842",
-"R 	c #816C3F",
-"S 	c #7D6738",
-"T 	c #664C15",
-"U 	c #51421F",
-"V 	c #9B7B0D",
-"W 	c #776641",
-"X 	c #8C784C",
-"Y 	c #745C28",
-"Z 	c #776030",
-"` 	c #615233",
-" .	c #A08216",
-"..	c #39301F",
-"+.	c #A29374",
-"@.	c #5E471A",
-"#.	c #866C1D",
-"$.	c #FEF12F",
-"%.	c #C3C22B",
-"&.	c #372E16",
-"*.	c #2B2210",
-"=.	c #817723",
-"-.	c #FFAD3C",
-";.	c #FF963C",
-">.	c #8A7228",
-",.	c #372B0F",
-"'.	c #342910",
-").	c #362C14",
-"!.	c #41351B",
-"~.	c #423721",
-"{.	c #3C321A",
-"].	c #3B2F15",
-"^.	c #31260F",
-"/.	c #392D12",
-"(.	c #3E3216",
-"_.	c #42351D",
-":.	c #473A1D",
-"<.	c #42361E",
-"[.	c #2B2008",
-"}.	c #463B25",
-"|.	c #3D3116",
-"1.	c #3E331B",
-"2.	c #423416",
-"3.	c #5E4716",
-"4.	c #69562F",
-"5.	c #322811",
-"6.	c #B0A286",
-"7.	c #6F592A",
-"8.	c #816E0E",
-"9.	c #F7E82E",
-"0.	c #F4E42F",
-"a.	c #6A5F23",
-"b.	c #413715",
-"c.	c #D8B434",
-"d.	c #FFA63B",
-"e.	c #FF973D",
-"f.	c #A6782A",
-"g.	c #4A3D22",
-"h.	c #43381C",
-"i.	c #44391D",
-"j.	c #3F3012",
-"k.	c #4B3D22",
-"l.	c #493D21",
-"m.	c #45391D",
-"n.	c #3F2F10",
-"o.	c #403113",
-"p.	c #3D3010",
-"q.	c #423B1C",
-"r.	c #442E18",
-"s.	c #5A3229",
-"t.	c #513E26",
-"u.	c #473D1C",
-"v.	c #3A310C",
-"w.	c #3B3418",
-"x.	c #897235",
-"y.	c #7C6739",
-"z.	c #433923",
-"A.	c #A39679",
-"B.	c #7C663E",
-"C.	c #C1B52F",
-"D.	c #B49F21",
-"E.	c #CBBC2A",
-"F.	c #C3C026",
-"G.	c #685422",
-"H.	c #F3B837",
-"I.	c #F09436",
-"J.	c #FF973C",
-"K.	c #C27C32",
-"L.	c #584A29",
-"M.	c #4E4223",
-"N.	c #7C4425",
-"O.	c #9E4825",
-"P.	c #9F3324",
-"Q.	c #873A29",
-"R.	c #5D4425",
-"S.	c #504724",
-"T.	c #604527",
-"U.	c #A82E43",
-"V.	c #C03B5A",
-"W.	c #B7164A",
-"X.	c #CA0275",
-"Y.	c #882B46",
-"Z.	c #3F3A18",
-"`.	c #9B2A71",
-" +	c #C217AE",
-".+	c #A019A6",
-"++	c #724931",
-"@+	c #543F0D",
-"#+	c #342912",
-"$+	c #A59677",
-"%+	c #6C5837",
-"&+	c #E5E12F",
-"*+	c #F5EA2E",
-"=+	c #87791B",
-"-+	c #ECD12E",
-";+	c #E5B932",
-">+	c #A37F22",
-",+	c #E28E36",
-"'+	c #EF8F37",
-")+	c #CF7C31",
-"!+	c #42381E",
-"~+	c #6F4E25",
-"{+	c #CF552B",
-"]+	c #FF3C2C",
-"^+	c #FF2928",
-"/+	c #E71D21",
-"(+	c #642D17",
-"_+	c #4C3117",
-":+	c #E11F40",
-"<+	c #F30039",
-"[+	c #D30347",
-"}+	c #E10065",
-"|+	c #D30075",
-"1+	c #891D45",
-"2+	c #A80F7A",
-"3+	c #B4068B",
-"4+	c #A707A3",
-"5+	c #9800C1",
-"6+	c #9502CB",
-"7+	c #583A33",
-"8+	c #2C2209",
-"9+	c #9D9378",
-"0+	c #92770C",
-"a+	c #F0E132",
-"b+	c #B0AA29",
-"c+	c #E4DF2E",
-"d+	c #D1B62C",
-"e+	c #E9CB30",
-"f+	c #574921",
-"g+	c #EC9B3A",
-"h+	c #D3792E",
-"i+	c #DA8433",
-"j+	c #46381C",
-"k+	c #7C4B22",
-"l+	c #FE5E33",
-"m+	c #EA3F27",
-"n+	c #F02826",
-"o+	c #FF1E27",
-"p+	c #863426",
-"q+	c #7E3427",
-"r+	c #FD043D",
-"s+	c #BC0E30",
-"t+	c #B81138",
-"u+	c #AC1151",
-"v+	c #CF0274",
-"w+	c #672D32",
-"x+	c #622E35",
-"y+	c #54202D",
-"z+	c #941188",
-"A+	c #9E00C0",
-"B+	c #9100C7",
-"C+	c #8E1795",
-"D+	c #302614",
-"E+	c #A59A80",
-"F+	c #908728",
-"G+	c #EADF29",
-"H+	c #372D16",
-"I+	c #A59F27",
-"J+	c #F4E62D",
-"K+	c #837D1A",
-"L+	c #483A1A",
-"M+	c #E6993A",
-"N+	c #E08033",
-"O+	c #E68E3A",
-"P+	c #59411C",
-"Q+	c #C2682C",
-"R+	c #FF5834",
-"S+	c #CB3F24",
-"T+	c #743322",
-"U+	c #633A25",
-"V+	c #473B20",
-"W+	c #863026",
-"X+	c #F9052E",
-"Y+	c #71211F",
-"Z+	c #9D2031",
-"`+	c #A71B4F",
-" @	c #DD007E",
-".@	c #7C283C",
-"+@	c #852251",
-"@@	c #BC029F",
-"#@	c #831C61",
-"$@	c #500F57",
-"%@	c #7804AD",
-"&@	c #7D0AC0",
-"*@	c #382526",
-"=@	c #AA9D80",
-"-@	c #DCDA32",
-";@	c #B5AA24",
-">@	c #36280C",
-",@	c #4A3D1E",
-"'@	c #79701B",
-")@	c #372C17",
-"!@	c #514822",
-"~@	c #F0993C",
-"{@	c #FB973A",
-"]@	c #ED8839",
-"^@	c #52421C",
-"/@	c #915A2E",
-"(@	c #FF5732",
-"_@	c #D94222",
-":@	c #49381D",
-"<@	c #4A3B21",
-"[@	c #853729",
-"}@	c #5A2511",
-"|@	c #EE0335",
-"1@	c #A21626",
-"2@	c #8E2033",
-"3@	c #EB0060",
-"4@	c #D70085",
-"5@	c #5A3122",
-"6@	c #B50B7B",
-"7@	c #C100A8",
-"8@	c #58282A",
-"9@	c #451442",
-"0@	c #7F347D",
-"a@	c #7B08C9",
-"b@	c #351E27",
-"c@	c #BBAD86",
-"d@	c #DFCF32",
-"e@	c #846F3F",
-"f@	c #3A2D12",
-"g@	c #514625",
-"h@	c #ECEDAA",
-"i@	c #ABB9A5",
-"j@	c #4D4317",
-"k@	c #EDA53F",
-"l@	c #EE9A3B",
-"m@	c #D58132",
-"n@	c #513F16",
-"o@	c #5A4524",
-"p@	c #9F4925",
-"q@	c #FC3A2D",
-"r@	c #EF2A29",
-"s@	c #E8282B",
-"t@	c #DE2334",
-"u@	c #302C13",
-"v@	c #723226",
-"w@	c #CB1A45",
-"x@	c #C70D41",
-"y@	c #D10366",
-"z@	c #D10383",
-"A@	c #42340E",
-"B@	c #801E51",
-"C@	c #C307A1",
-"D@	c #96147C",
-"E@	c #6E0F82",
-"F@	c #8E1799",
-"G@	c #933F9B",
-"H@	c #3D3120",
-"I@	c #B0A180",
-"J@	c #836C35",
-"K@	c #867249",
-"L@	c #433619",
-"M@	c #423413",
-"N@	c #C6AB4C",
-"O@	c #E7BD0F",
-"P@	c #524411",
-"Q@	c #5A4F26",
-"R@	c #64542B",
-"S@	c #4F4020",
-"T@	c #47391F",
-"U@	c #46381D",
-"V@	c #422D0D",
-"W@	c #7B3E26",
-"X@	c #8B3224",
-"Y@	c #773622",
-"Z@	c #523920",
-"`@	c #943030",
-" #	c #623D2A",
-".#	c #492C13",
-"+#	c #D50166",
-"@#	c #B91563",
-"##	c #3A310B",
-"$#	c #493E22",
-"%#	c #583531",
-"&#	c #5B2F37",
-"*#	c #4E2D34",
-"=#	c #6F512C",
-"-#	c #8A794D",
-";#	c #A1977B",
-">#	c #614D14",
-",#	c #65542B",
-"'#	c #463C27",
-")#	c #52462B",
-"!#	c #352710",
-"~#	c #5D4517",
-"{#	c #EBC013",
-"]#	c #5A5029",
-"^#	c #3B2D12",
-"/#	c #3A2C0E",
-"(#	c #453616",
-"_#	c #3B2B0E",
-":#	c #40300F",
-"<#	c #46391D",
-"[#	c #493D1F",
-"}#	c #403210",
-"|#	c #413615",
-"1#	c #932A28",
-"2#	c #EC1F42",
-"3#	c #782825",
-"4#	c #BE1245",
-"5#	c #E5006F",
-"6#	c #652E31",
-"7#	c #615021",
-"8#	c #443518",
-"9#	c #4E3F21",
-"0#	c #443921",
-"a#	c #392D14",
-"b#	c #513B0C",
-"c#	c #6C5923",
-"d#	c #2F2511",
-"e#	c #9F9175",
-"f#	c #5A4612",
-"g#	c #5D4B22",
-"h#	c #514429",
-"i#	c #47391B",
-"j#	c #433310",
-"k#	c #AE7505",
-"l#	c #F6D70E",
-"m#	c #5A4111",
-"n#	c #2E1D04",
-"o#	c #403218",
-"p#	c #3D2D10",
-"q#	c #3A2B0D",
-"r#	c #4E4020",
-"s#	c #463A1E",
-"t#	c #4A3A1B",
-"u#	c #433413",
-"v#	c #4C3C21",
-"w#	c #A0313C",
-"x#	c #C22649",
-"y#	c #BF2654",
-"z#	c #861D4C",
-"A#	c #C3B30C",
-"B#	c #745A15",
-"C#	c #40341C",
-"D#	c #4D4026",
-"E#	c #4B3D21",
-"F#	c #3D321C",
-"G#	c #625126",
-"H#	c #6F5D2C",
-"I#	c #3D3320",
-"J#	c #A79C7E",
-"K#	c #7A6437",
-"L#	c #755F2E",
-"M#	c #35280C",
-"N#	c #45381A",
-"O#	c #4D3F1E",
-"P#	c #423415",
-"Q#	c #3F331D",
-"R#	c #574625",
-"S#	c #ECEA99",
-"T#	c #F3F698",
-"U#	c #625424",
-"V#	c #493C22",
-"W#	c #3E3015",
-"X#	c #604D1B",
-"Y#	c #654C0C",
-"Z#	c #664C1A",
-"`#	c #5D420E",
-" $	c #53441B",
-".$	c #32280B",
-"+$	c #4C481B",
-"@$	c #635C1D",
-"#$	c #FFE900",
-"$$	c #B7930B",
-"%$	c #2C2414",
-"&$	c #4A3B20",
-"*$	c #483B20",
-"=$	c #4B3F22",
-"-$	c #413621",
-";$	c #846E3F",
-">$	c #7A6438",
-",$	c #3E3118",
-"'$	c #A59777",
-")$	c #796433",
-"!$	c #816C3E",
-"~$	c #3E3116",
-"{$	c #4B3C1B",
-"]$	c #413212",
-"^$	c #47391E",
-"/$	c #4A3B14",
-"($	c #E9EB95",
-"_$	c #6E7370",
-":$	c #595245",
-"<$	c #50400D",
-"[$	c #E6D601",
-"}$	c #C88A00",
-"|$	c #95741C",
-"1$	c #927022",
-"2$	c #A4862D",
-"3$	c #C0920F",
-"4$	c #B57200",
-"5$	c #C69E12",
-"6$	c #363C3B",
-"7$	c #E6C900",
-"8$	c #443615",
-"9$	c #48391E",
-"0$	c #4A3C21",
-"a$	c #483A1D",
-"b$	c #3B3017",
-"c$	c #7E6838",
-"d$	c #5F4307",
-"e$	c #3C3017",
-"f$	c #9E9071",
-"g$	c #7B6433",
-"h$	c #77602F",
-"i$	c #3F351F",
-"j$	c #3F3318",
-"k$	c #524325",
-"l$	c #413213",
-"m$	c #3D2E11",
-"n$	c #3C2D0F",
-"o$	c #42341A",
-"p$	c #464C4A",
-"q$	c #DBD556",
-"r$	c #D1C311",
-"s$	c #7A8899",
-"t$	c #BEDCFA",
-"u$	c #E3FAF1",
-"v$	c #EFFDF0",
-"w$	c #DEFAFF",
-"x$	c #CDEDFF",
-"y$	c #C6DEE9",
-"z$	c #9FC3E5",
-"A$	c #E4C725",
-"B$	c #705B0E",
-"C$	c #493D22",
-"D$	c #4A3D21",
-"E$	c #3F3112",
-"F$	c #483A1E",
-"G$	c #46391C",
-"H$	c #403620",
-"I$	c #7E693A",
-"J$	c #3D3115",
-"K$	c #A69A7C",
-"L$	c #6B5524",
-"M$	c #7B6636",
-"N$	c #443922",
-"O$	c #403317",
-"P$	c #4B3F23",
-"Q$	c #392C11",
-"R$	c #4E3E20",
-"S$	c #382911",
-"T$	c #D0BC0E",
-"U$	c #80835D",
-"V$	c #CADEEA",
-"W$	c #ADE1FF",
-"X$	c #CCA428",
-"Y$	c #F8D516",
-"Z$	c #F3CC13",
-"`$	c #E9B22B",
-" %	c #7C837E",
-".%	c #EFF9FF",
-"+%	c #666C59",
-"@%	c #866B10",
-"#%	c #493D27",
-"$%	c #483A1F",
-"%%	c #46391F",
-"&%	c #44381D",
-"*%	c #44361A",
-"=%	c #423823",
-"-%	c #786131",
-";%	c #786231",
-">%	c #382C0F",
-",%	c #A49A7F",
-"'%	c #72602E",
-")%	c #5A471D",
-"!%	c #3F300F",
-"~%	c #3F351E",
-"{%	c #554310",
-"]%	c #C9BA19",
-"^%	c #D7E1ED",
-"/%	c #E3EFFB",
-"(%	c #7C712C",
-"_%	c #BAAF0B",
-":%	c #020009",
-"<%	c #0C090E",
-"[%	c #08060B",
-"}%	c #6F5313",
-"|%	c #B3D3E0",
-"1%	c #C38400",
-"2%	c #533F10",
-"3%	c #48391F",
-"4%	c #4A3B1C",
-"5%	c #4D4121",
-"6%	c #3B2B0D",
-"7%	c #453615",
-"8%	c #43381F",
-"9%	c #3F341C",
-"0%	c #766433",
-"a%	c #392F1C",
-"b%	c #95886C",
-"c%	c #6C571E",
-"d%	c #73623F",
-"e%	c #3E3011",
-"f%	c #3A2C0D",
-"g%	c #3B2D0F",
-"h%	c #45371B",
-"i%	c #44371F",
-"j%	c #D3AD00",
-"k%	c #7A8A9F",
-"l%	c #FFFFFF",
-"m%	c #A7C2CA",
-"n%	c #C5A500",
-"o%	c #1E2646",
-"p%	c #59523B",
-"q%	c #241C0C",
-"r%	c #251E14",
-"s%	c #5C410E",
-"t%	c #6E9ACD",
-"u%	c #D1A900",
-"v%	c #43361E",
-"w%	c #483A20",
-"x%	c #47391D",
-"y%	c #493A1D",
-"z%	c #4B3F25",
-"A%	c #5C471A",
-"B%	c #66531B",
-"C%	c #362C19",
-"D%	c #6F5A2B",
-"E%	c #7F6939",
-"F%	c #44371A",
-"G%	c #4C4124",
-"H%	c #3C2C0E",
-"I%	c #423519",
-"J%	c #453619",
-"K%	c #42351B",
-"L%	c #C3DAEE",
-"M%	c #B8C3A6",
-"N%	c #5C4200",
-"O%	c #404951",
-"P%	c #9CA790",
-"Q%	c #A9891B",
-"R%	c #D2AD03",
-"S%	c #E1AB07",
-"T%	c #5B4F3C",
-"U%	c #DFC400",
-"V%	c #3D2E15",
-"W%	c #413110",
-"X%	c #3A2A0D",
-"Y%	c #3F2F0C",
-"Z%	c #44361B",
-"`%	c #4E4021",
-" &	c #41341B",
-".&	c #352B15",
-"+&	c #6E5520",
-"@&	c #7F6A3F",
-"#&	c #3B3015",
-"$&	c #AEA083",
-"%&	c #857144",
-"&&	c #504429",
-"*&	c #3F3113",
-"=&	c #46381B",
-"-&	c #44381C",
-";&	c #4B3F26",
-">&	c #AC6C00",
-",&	c #BCDCFB",
-"'&	c #999788",
-")&	c #65450F",
-"!&	c #E3CD00",
-"~&	c #A28510",
-"{&	c #899991",
-"]&	c #A3B9CA",
-"^&	c #EEF0DE",
-"/&	c #BCCDC9",
-"(&	c #797D60",
-"_&	c #9D7B01",
-":&	c #443722",
-"<&	c #4F4023",
-"[&	c #4E4321",
-"}&	c #473B21",
-"|&	c #4E4022",
-"1&	c #3B321B",
-"2&	c #352A13",
-"3&	c #6C5521",
-"4&	c #867143",
-"5&	c #433A28",
-"6&	c #A39371",
-"7&	c #5C4512",
-"8&	c #836E41",
-"9&	c #362A0E",
-"0&	c #4B3D20",
-"a&	c #4B3C1D",
-"b&	c #402F0D",
-"c&	c #44371E",
-"d&	c #B37300",
-"e&	c #7E94B3",
-"f&	c #FEFFFF",
-"g&	c #B2C8CE",
-"h&	c #DED322",
-"i&	c #8A95A6",
-"j&	c #D4F3DE",
-"k&	c #FFF993",
-"l&	c #F1E72F",
-"m&	c #84909A",
-"n&	c #EDF3F5",
-"o&	c #E4F2FF",
-"p&	c #C9B53C",
-"q&	c #4E3711",
-"r&	c #3B2C10",
-"s&	c #4F4022",
-"t&	c #433517",
-"u&	c #47381E",
-"v&	c #40341B",
-"w&	c #372E19",
-"x&	c #6F5A28",
-"y&	c #5F4306",
-"z&	c #3A2E15",
-"A&	c #A2967A",
-"B&	c #5A4B2B",
-"C&	c #65542D",
-"D&	c #34280E",
-"E&	c #544A23",
-"F&	c #443515",
-"G&	c #46371A",
-"H&	c #4D3F20",
-"I&	c #5A461E",
-"J&	c #937E3A",
-"K&	c #AFCADB",
-"L&	c #A8B6C4",
-"M&	c #B0B15F",
-"N&	c #E8DD2D",
-"O&	c #7E6603",
-"P&	c #483F04",
-"Q&	c #2D2C21",
-"R&	c #624201",
-"S&	c #99BCCB",
-"T&	c #FDFFFF",
-"U&	c #ABAB97",
-"V&	c #BC8102",
-"W&	c #4C3F24",
-"X&	c #41310F",
-"Y&	c #423313",
-"Z&	c #3E3115",
-"`&	c #3A3019",
-" *	c #715F38",
-".*	c #594C2B",
-"+*	c #382E18",
-"@*	c #9B9178",
-"#*	c #93790F",
-"$*	c #524223",
-"%*	c #40361F",
-"&*	c #50442A",
-"**	c #4A3D1F",
-"=*	c #473813",
-"-*	c #5E4E0E",
-";*	c #F0E30A",
-">*	c #6A809D",
-",*	c #949EAF",
-"'*	c #98BBEB",
-")*	c #D0AB22",
-"!*	c #574705",
-"~*	c #3F370C",
-"{*	c #363316",
-"]*	c #F6E008",
-"^*	c #7DA6CA",
-"/*	c #9EA6AB",
-"(*	c #ADA884",
-"_*	c #BB8F03",
-":*	c #463A22",
-"<*	c #382E1B",
-"[*	c #4C3D21",
-"}*	c #3F3217",
-"|*	c #3B3321",
-"1*	c #574725",
-"2*	c #9B7C11",
-"3*	c #3B3220",
-"4*	c #A79C80",
-"5*	c #735F31",
-"6*	c #705A29",
-"7*	c #332506",
-"8*	c #493D20",
-"9*	c #4B3C1C",
-"0*	c #31221B",
-"a*	c #EEEE44",
-"b*	c #E3D036",
-"c*	c #655618",
-"d*	c #D4C81D",
-"e*	c #597BBE",
-"f*	c #939FB1",
-"g*	c #9BA7AD",
-"h*	c #80907C",
-"i*	c #CAB249",
-"j*	c #936F00",
-"k*	c #7496B2",
-"l*	c #9BB2D0",
-"m*	c #82AAD4",
-"n*	c #FADC00",
-"o*	c #3C2F15",
-"p*	c #3F3215",
-"q*	c #4A3C20",
-"r*	c #483C20",
-"s*	c #43371C",
-"t*	c #38301F",
-"u*	c #68572C",
-"v*	c #533F13",
-"w*	c #3A301A",
-"x*	c #A39871",
-"y*	c #7B6638",
-"z*	c #644F1F",
-"A*	c #382F1C",
-"B*	c #423417",
-"C*	c #4B3F21",
-"D*	c #867A24",
-"E*	c #ECEB47",
-"F*	c #796734",
-"G*	c #3A2B12",
-"H*	c #3E2F11",
-"I*	c #372A22",
-"J*	c #D7B102",
-"K*	c #859E8E",
-"L*	c #89B7DA",
-"M*	c #B9CDD1",
-"N*	c #6596EE",
-"O*	c #84BDFA",
-"P*	c #C2E1D0",
-"Q*	c #EBEE7C",
-"R*	c #CBAC0B",
-"S*	c #A1B4BD",
-"T*	c #433212",
-"U*	c #3A2B0E",
-"V*	c #423317",
-"W*	c #473A1F",
-"X*	c #3D341F",
-"Y*	c #776744",
-"Z*	c #654B13",
-"`*	c #998967",
-" =	c #644E1E",
-".=	c #69562D",
-"+=	c #271E08",
-"@=	c #4A3D24",
-"#=	c #72672D",
-"$=	c #43351B",
-"%=	c #423619",
-"&=	c #413216",
-"*=	c #463619",
-"==	c #625411",
-"-=	c #CCAE13",
-";=	c #F5E52C",
-">=	c #EEE630",
-",=	c #F6D01E",
-"'=	c #A68F15",
-")=	c #6C5D10",
-"!=	c #483E28",
-"~=	c #58646E",
-"{=	c #7D98B0",
-"]=	c #493F25",
-"^=	c #49412C",
-"/=	c #4C3D20",
-"(=	c #403520",
-"_=	c #6C5B36",
-":=	c #695934",
-"<=	c #3C321C",
-"[=	c #A79877",
-"}=	c #6A521F",
-"|=	c #846F40",
-"1=	c #382B0E",
-"2=	c #2F240F",
-"3=	c #443820",
-"4=	c #41351D",
-"5=	c #4A3F29",
-"6=	c #43371E",
-"7=	c #32260A",
-"8=	c #392C10",
-"9=	c #372E20",
-"0=	c #221A13",
-"a=	c #271D13",
-"b=	c #2B251E",
-"c=	c #30281A",
-"d=	c #291F07",
-"e=	c #3D321A",
-"f=	c #3A2E16",
-"g=	c #627587",
-"h=	c #A3BDD2",
-"i=	c #3E3624",
-"j=	c #2F260F",
-"k=	c #2D230C",
-"l=	c #251D0D",
-"m=	c #423720",
-"n=	c #715C30",
-"o=	c #523E12",
-"p=	c #2D230B",
-"q=	c #A09477",
-"r=	c #44310B",
-"s=	c #6D5B33",
-"t=	c #674D15",
-"u=	c #735E2D",
-"v=	c #7F6B3B",
-"w=	c #4F3603",
-"x=	c #5D4A1F",
-"y=	c #836E3F",
-"z=	c #755E2C",
-"A=	c #765F2E",
-"B=	c #7E6B3F",
-"C=	c #5A4416",
-"D=	c #63522D",
-"E=	c #6C5520",
-"F=	c #857245",
-"G=	c #765F2C",
-"H=	c #5A461A",
-"I=	c #564625",
-"J=	c #675220",
-"K=	c #674D16",
-"L=	c #6E5723",
-"M=	c #655B3E",
-"N=	c #8B9BAF",
-"O=	c #634D1A",
-"P=	c #776238",
-"Q=	c #604F29",
-"R=	c #504B2E",
-"S=	c #332813",
-"T=	c #5B4E2F",
-"U=	c #2C2510",
-"V=	c #948A6E",
-"W=	c #997B0F",
-"X=	c #645432",
-"Y=	c #7C673A",
-"Z=	c #62480E",
-"`=	c #877348",
-" -	c #65551F",
-".-	c #6C5B2A",
-"+-	c #7F6B3F",
-"@-	c #7B6535",
-"#-	c #765F32",
-"$-	c #6E5B23",
-"%-	c #73612F",
-"&-	c #786133",
-"*-	c #705929",
-"=-	c #867248",
-"--	c #5A4A28",
-";-	c #9B7C10",
-">-	c #75643C",
-",-	c #786236",
-"'-	c #847044",
-")-	c #7A6434",
-"!-	c #5B4A26",
-"~-	c #9E8521",
-"{-	c #625435",
-"]-	c #6D5727",
-"^-	c #6D5E3C",
-"/-	c #423E29",
-"(-	c #453A21",
-"_-	c #242313",
-":-	c #6F603C",
-"<-	c #322814",
-"[-	c #443A24",
-"}-	c #413721",
-"|-	c #2F250F",
-"1-	c #332B19",
-"2-	c #433820",
-"3-	c #3F341D",
-"4-	c #433922",
-"5-	c #39301C",
-"6-	c #2F240D",
-"7-	c #322A16",
-"8-	c #31260E",
-"9-	c #453A24",
-"0-	c #3B311C",
-"a-	c #322917",
-"b-	c #3E341D",
-"c-	c #3C3018",
-"d-	c #382D16",
-"e-	c #413720",
-"f-	c #2E2105",
-"g-	c #3B321F",
-"h-	c #372C14",
-"i-	c #362C16",
-"j-	c #39311F",
-"k-	c #2A1E0E",
-"l-	c #292116",
-"m-	c #17170D",
-". + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < ' : [ } | 1 2 ",
-"3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s n t u v w ",
-"x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z `  ...",
-"+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.",
-"6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.g.u.v.w.x.y.z.",
-"A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+",
-"$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+",
-"9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+D+",
-"E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@",
-"=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@",
-"c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@",
-"I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ #m..#+#@###$#%#&#*#=#-#H+",
-";#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#",
-"e#f#g#,.h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I#",
-"J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$",
-"'$)$!$l.~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$j+9$0$a$b$c$d$e$",
-"f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$c$I$J$",
-"K$L$M$N$O$P$Q$R$j+S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%V#$%%%&%*%=%-%;%>%",
-",%'%)%!%k.:#~%i#T@{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%g#0%a%",
-"b%c%d%|.e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%j+x%y%z%j$|.A%B%C%",
-"| D%E%F%G%H%I%J%K%4$L%l%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&",
-"$&I$%&0#&&*&=&-&;&>&,&l%'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&1&2&3&4&5&",
-"6&7&8&9&0&$%a&b&c&d&e&f&g&h&i&j&k&l&m&n&o&p&q&r&s&t&u&v&w&x&y&z&",
-"A&B&C&D&E&F&(#G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&W&X&Y&4%Z&`& *.*+*",
-"@*#*$*%*&*=$**7%=*-*;*>*,*'*)*!*~*{*]*^*/*(*_*:*o.<*[*}*|*1*2*3*",
-"4*5*6*7*8*9*l$0*a*b*c*d*e*f*g*h*i*j*k*l*m*n*o*T@p*q*r*s*t*u*v*w*",
-"x*y*z*A*B*C*D*E*F*G*H*I*J*K*L*M*N*O*P*Q*R*S*r#T*U*V*x%W*X*Y*Z*#+",
-"`* =.=+=!.@=#=$=W&%=m$&=*===-=;=>=,='=)=!=~={=]=&%~$^=/=(=_=:=<=",
-"[=}=|=1=2=3=4=/.5=~%6=5=7=8=9=0=a=b=c=d=e=f=g=h=i=j=k=l=m=n=o=p=",
-"q=r=s=t=u=v=w=x=y=z=A=B=C=D=E=F=G=H=I=J=K=R L=M=N=O=P=Q=R=S=T=U=",
-"V=W=X=Y=Z=`= -.-+-@-y=#-$-%-&-*-=---;->-,-'-)-!-~-{-h ]-^-/-(-_-",
-":-<-w [-2&}-|-1-2-3-4-5-6-7-~.8-9-0-a-b-c-d-e-f-k=g-h-i-j-k-l-m-"};
diff --git a/mk/linux/megaglest_editor.desktop b/mk/linux/megaglest_editor.desktop
deleted file mode 100644
index 053bfcb68..000000000
--- a/mk/linux/megaglest_editor.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Categories=Game;StrategyGame;
-Comment=Map Editor
-Name=MegaGlest Map Editor
-Icon=megaglest
-Exec=megaglest_editor
-Terminal=false
-Type=Application
-Keywords=map;editor;
-
diff --git a/mk/linux/megaglest_g3dviewer.desktop b/mk/linux/megaglest_g3dviewer.desktop
deleted file mode 100644
index 3c0ffd854..000000000
--- a/mk/linux/megaglest_g3dviewer.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Categories=Game;StrategyGame;
-Comment=G3d Model Viewer
-Name=MegaGlest Model Viewer
-Icon=megaglest
-Exec=megaglest_g3dviewer
-Terminal=false
-Type=Application
-Keywords=model;viewer;
-
diff --git a/mk/linux/tools-for-standalone-client/installer/make.sh b/mk/linux/tools-for-standalone-client/installer/make.sh
index 36502c5c4..99d049075 100755
--- a/mk/linux/tools-for-standalone-client/installer/make.sh
+++ b/mk/linux/tools-for-standalone-client/installer/make.sh
@@ -147,6 +147,7 @@ if [ $REPACKONLY -eq 0 ]; then
 	cp -r * "$CURRENTDIR/$INSTALLDATADIR"
 
 	cd "$CURRENTDIR"
+	cp megaglest-uninstall.ico "$CURRENTDIR/$INSTALLDATADIR"
 fi
 
 if [ ! -d data/docs ]; then
diff --git a/mk/linux/megaglest-uninstall.ico b/mk/linux/tools-for-standalone-client/installer/megaglest-uninstall.ico
similarity index 100%
rename from mk/linux/megaglest-uninstall.ico
rename to mk/linux/tools-for-standalone-client/installer/megaglest-uninstall.ico
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index 744bdec2d..3a70f8f81 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -204,21 +204,5 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
 	        INSTALL(FILES 
 	          "${PROJECT_SOURCE_DIR}/mk/shared/g3dviewer.ico"
 	          DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
-
-			IF(UNIX AND NOT APPLE)
-				# Installation of the program desktop file
-				SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/mk/linux/megaglest_g3dviewer.desktop)
-
-				INSTALL(FILES
-					"${MG_DESKTOP_FILE}"
-					DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
-
-				IF(NOT BUILD_MEGAGLEST)
-					INSTALL(FILES
-						"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
-						"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
-						DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
-				ENDIF()
-			ENDIF()
         ENDIF()
 ENDIF()
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index 515202beb..a91fbbf64 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -306,7 +306,7 @@ IF(BUILD_MEGAGLEST)
 		          DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
 	        ENDIF()
 
-		IF(NOT WIN32)
+		IF(UNIX)
 			INSTALL(FILES
 				"${PROJECT_SOURCE_DIR}/mk/linux/start_megaglest_gameserver"
 				DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
@@ -339,38 +339,12 @@ IF(BUILD_MEGAGLEST)
 			ENDIF()
 		ENDIF()
 
-		# Installation of data files from outside normal data folder
-		#INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/source/masterserver/flags" 
-		#  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
-		#  OPTIONAL REGEX "/.git" EXCLUDE)
-
-	        #MESSAGE(STATUS "**Source package detected git folder structure.")
-
-		IF(NOT APPLE)
-			# Installation of the program desktop file
-			INSTALL(FILES
-				"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop"
-				DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
-		ENDIF()
-
-		# Installation of the program desktop icon file
 		INSTALL(FILES
 			"${PROJECT_SOURCE_DIR}/mk/shared/megaglest.ico"
-			DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
-		IF(UNIX AND NOT APPLE)
+			DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
+		IF(UNIX AND APPLE AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
 			INSTALL(FILES
-				"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
-				"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
-				DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
-		ELSEIF(UNIX AND APPLE)
-			IF(NOT WANT_SINGLE_INSTALL_DIRECTORY)
-				INSTALL(FILES
-					"${PROJECT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.icns"
-					DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
-			ENDIF()
-		ELSE()
-			INSTALL(FILES
-				"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
+				"${PROJECT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.icns"
 				DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
 		ENDIF()
 	ENDIF()
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index 73b55becc..c3c8024ed 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -194,21 +194,5 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
 	        INSTALL(FILES 
                   "${PROJECT_SOURCE_DIR}/mk/shared/editor.ico"
 	          DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
-
-			IF(UNIX AND NOT APPLE)
-				# Installation of the program desktop file
-				SET(MG_DESKTOP_FILE ${PROJECT_SOURCE_DIR}/mk/linux/megaglest_editor.desktop)
-
-				INSTALL(FILES
-					"${MG_DESKTOP_FILE}"
-					DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
-
-				IF(NOT BUILD_MEGAGLEST)
-					INSTALL(FILES
-						"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
-						"${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
-						DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
-				ENDIF()
-			ENDIF()
         ENDIF()
 ENDIF()