From 48dddd0eb5cc1bbaf4423569336642e09b33e4f5 Mon Sep 17 00:00:00 2001 From: rikky Date: Fri, 10 Jun 2011 21:15:49 +0000 Subject: [PATCH] Fix:xpm:Fix cmake android build by removing image doublets git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4530 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/xpm/Makefile.am | 11 --- navit/navit/xpm/bench.xpm | 21 ------ navit/navit/xpm/boundary_stone.xpm | 39 ----------- navit/navit/xpm/fountain.xpm | 22 ------ navit/navit/xpm/golf.xpm | 40 ----------- navit/navit/xpm/justice.xpm | 20 ------ navit/navit/xpm/military.xpm | 21 ------ navit/navit/xpm/ruins.xpm | 22 ------ navit/navit/xpm/skiing.xpm | 21 ------ navit/navit/xpm/swimming.xpm | 138 ------------------------------------- navit/navit/xpm/toilets.xpm | 21 ------ navit/navit/xpm/wifi.xpm | 21 ------ 12 files changed, 397 deletions(-) delete mode 100644 navit/navit/xpm/bench.xpm delete mode 100644 navit/navit/xpm/boundary_stone.xpm delete mode 100644 navit/navit/xpm/fountain.xpm delete mode 100644 navit/navit/xpm/golf.xpm delete mode 100644 navit/navit/xpm/justice.xpm delete mode 100644 navit/navit/xpm/military.xpm delete mode 100644 navit/navit/xpm/ruins.xpm delete mode 100644 navit/navit/xpm/skiing.xpm delete mode 100644 navit/navit/xpm/swimming.xpm delete mode 100644 navit/navit/xpm/toilets.xpm delete mode 100644 navit/navit/xpm/wifi.xpm diff --git a/navit/navit/xpm/Makefile.am b/navit/navit/xpm/Makefile.am index 8751ba9..b2a07c8 100644 --- a/navit/navit/xpm/Makefile.am +++ b/navit/navit/xpm/Makefile.am @@ -24,19 +24,8 @@ xpm_DATA += public_office.xpm ## Obsolete. Should be removed eventually... -xpm_DATA += bench.xpm xpm_DATA += biergarten.xpm -xpm_DATA += boundary_stone.xpm -xpm_DATA += fountain.xpm -xpm_DATA += golf.xpm -xpm_DATA += justice.xpm -xpm_DATA += military.xpm xpm_DATA += restroom.xpm -xpm_DATA += ruins.xpm -xpm_DATA += skiing.xpm -xpm_DATA += swimming.xpm -xpm_DATA += toilets.xpm -xpm_DATA += wifi.xpm ## Obsolete end diff --git a/navit/navit/xpm/bench.xpm b/navit/navit/xpm/bench.xpm deleted file mode 100644 index 5a9007f..0000000 --- a/navit/navit/xpm/bench.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"16 16 2 1", -". c None", -"# c #000000", -"................", -"................", -"................", -"................", -"................", -"................", -".##############.", -"...#........#...", -"...#........#...", -"...#........#...", -"................", -"................", -"................", -"................", -"................", -"................"}; diff --git a/navit/navit/xpm/boundary_stone.xpm b/navit/navit/xpm/boundary_stone.xpm deleted file mode 100644 index 2c8b397..0000000 --- a/navit/navit/xpm/boundary_stone.xpm +++ /dev/null @@ -1,39 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"32 32 4 1", -". c None", -"b c #797979", -"a c #7e7e7e", -"# c #999999", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"..............##................", -".............###a...............", -".............###b...............", -".............###b...............", -".............###b...............", -".............###b...............", -".............###b...............", -".............###b...............", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; diff --git a/navit/navit/xpm/fountain.xpm b/navit/navit/xpm/fountain.xpm deleted file mode 100644 index 38d5653..0000000 --- a/navit/navit/xpm/fountain.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"16 16 3 1", -". c None", -"a c #000000", -"# c #808080", -"................", -"................", -"................", -"........#.......", -"....a...a...a...", -".....#..#..#....", -"......#.a.#.....", -"......a.#.a.....", -".......#a#......", -".......a#a......", -"........a.......", -"........#.......", -"........a.......", -"................", -"................", -"................"}; diff --git a/navit/navit/xpm/golf.xpm b/navit/navit/xpm/golf.xpm deleted file mode 100644 index f514b44..0000000 --- a/navit/navit/xpm/golf.xpm +++ /dev/null @@ -1,40 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"16 16 21 1", -". c None", -"# c #000000", -"h c #010101", -"p c #020202", -"c c #040404", -"k c #080808", -"r c #0a0a0a", -"f c #161616", -"i c #1e1e1e", -"a c #232323", -"b c #323232", -"o c #515151", -"n c #525252", -"g c #535353", -"m c #5d5d5d", -"s c #626262", -"l c #676767", -"j c #f7f7f8", -"q c #fdfdfd", -"e c #fefefe", -"d c #ffffff", -"................", -"....########a...", -"......bcdef#g...", -"......##d#h#....", -"........#ij#....", -".......##k#.....", -"......l###......", -"......m##n......", -"......m##n......", -"......n##n......", -"......o##n......", -"......k##n......", -".....p#q#n......", -"....#re.#n......", -"........#s......", -"................"}; diff --git a/navit/navit/xpm/justice.xpm b/navit/navit/xpm/justice.xpm deleted file mode 100644 index ad40bff..0000000 --- a/navit/navit/xpm/justice.xpm +++ /dev/null @@ -1,20 +0,0 @@ -/* XPM */ -static char * justice_xpm[] = { -"16 13 4 1", -" c None", -". c #FFFFFF", -"+ c #000000", -"@ c #9B9B9B", -" .... ", -" ...++++... ", -" .+++....+++. ", -" .+..........+. ", -" .@........@. ", -" .@........@. ", -" .@.@......@.@. ", -" .@.@......@.@. ", -".@...@....@...@.", -".@...@....@...@.", -"+.....+..+.....+", -".+++++. .+++++.", -" ..... ..... "}; diff --git a/navit/navit/xpm/military.xpm b/navit/navit/xpm/military.xpm deleted file mode 100644 index ef9d6dc..0000000 --- a/navit/navit/xpm/military.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"16 16 2 1", -". c None", -"# c #000000", -"................", -"................", -"................", -"................", -".......#######..", -".#####.#######..", -".......#########", -"..##############", -".##############.", -".########.###.##", -"..###.#.#.#.###.", -"...##########...", -"................", -"................", -"................", -"................"}; diff --git a/navit/navit/xpm/ruins.xpm b/navit/navit/xpm/ruins.xpm deleted file mode 100644 index 61b8f80..0000000 --- a/navit/navit/xpm/ruins.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"16 16 3 1", -". c None", -"# c #000000", -"a c #010101", -"...........#.#.#", -"...........#####", -"..##.......#####", -".###........###.", -".###.#a##a#.###.", -".##############.", -".##############.", -".##.########.##.", -".#...######...#.", -".#...######...#.", -".######..######.", -".#####a..a#####.", -".#####....#####.", -".#####....#####.", -".#####....#####.", -"................"}; diff --git a/navit/navit/xpm/skiing.xpm b/navit/navit/xpm/skiing.xpm deleted file mode 100644 index b29be3c..0000000 --- a/navit/navit/xpm/skiing.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"16 16 2 1", -". c None", -"# c #000000", -"................", -"................", -".##.............", -".##.###...##....", -"...#######......", -"....#####.......", -"..####.##.......", -"...#####........", -".......##.....#.", -"........##..##..", -".........###....", -".......##.......", -"....###.........", -".###............", -"................", -"................"}; diff --git a/navit/navit/xpm/swimming.xpm b/navit/navit/xpm/swimming.xpm deleted file mode 100644 index 72f3715..0000000 --- a/navit/navit/xpm/swimming.xpm +++ /dev/null @@ -1,138 +0,0 @@ -/* XPM */ -static char * swimming_xpm[] = { -"16 16 119 2", -" c None", -". c #262CA6", -"+ c #242CA6", -"@ c #242DA7", -"# c #232EA8", -"$ c #232DA7", -"% c #2131AB", -"& c #2032AC", -"* c #2233AB", -"= c #2031AB", -"- c #222EA8", -"; c #222FA8", -"> c #1C33AC", -", c #222EA7", -"' c #0E44BC", -") c #0B4CC2", -"! c #5584BF", -"~ c #B9C7D9", -"{ c #EFF3F5", -"] c #5987BF", -"^ c #1243BD", -"/ c #1C36AF", -"( c #1E33AC", -"_ c #1E33AB", -": c #1B34AD", -"< c #1937AE", -"[ c #1B35AD", -"} c #7B94B7", -"| c #B3C1D3", -"1 c #A4B7CE", -"2 c #658ABD", -"3 c #C0CEDE", -"4 c #EEF1F4", -"5 c #3778C9", -"6 c #1D34AE", -"7 c #212FA9", -"8 c #3B69BD", -"9 c #7190B9", -"0 c #1048BC", -"a c #212FA8", -"b c #1935AF", -"c c #1A35AE", -"d c #1C35AD", -"e c #2436AB", -"f c #2230A9", -"g c #0F46C0", -"h c #183BB5", -"i c #2051BC", -"j c #E5EBEF", -"k c #E3E9EF", -"l c #2348B6", -"m c #2446B4", -"n c #F5F7F7", -"o c #FEFFFB", -"p c #93A8C1", -"q c #1141B6", -"r c #1A34AD", -"s c #1E2FA8", -"t c #173AB2", -"u c #173CB4", -"v c #2869C3", -"w c #8799C4", -"x c #D2D8E7", -"y c #FEFEFE", -"z c #D3DCE5", -"A c #2739AC", -"B c #EBF0F1", -"C c #FDFEFA", -"D c #869DBA", -"E c #1F33AB", -"F c #123CB4", -"G c #1838B0", -"H c #1A37AE", -"I c #5A80B7", -"J c #BDCAD9", -"K c #F9FBF9", -"L c #FCFDFB", -"M c #FCFCFC", -"N c #FCFCFA", -"O c #C0CCDA", -"P c #266DC4", -"Q c #437ABF", -"R c #084EC2", -"S c #1D33AB", -"T c #1837AF", -"U c #3355B1", -"V c #AFBED1", -"W c #7C96B6", -"X c #A8B9CE", -"Y c #6B8DB7", -"Z c #A2B6CC", -"` c #7291B8", -" . c #9BB0C9", -".. c #7391B7", -"+. c #93AAC3", -"@. c #3E78C0", -"#. c #1441B7", -"$. c #1A3AAF", -"%. c #0349BD", -"&. c #2A37A8", -"*. c #516BAE", -"=. c #7E96B4", -"-. c #6788B5", -";. c #8098B6", -">. c #6588B7", -",. c #859CB9", -"'. c #6C8DB6", -"). c #7A96B6", -"!. c #6C8BB6", -"~. c #7E97B6", -"{. c #5F84B7", -"]. c #7790B3", -"^. c #4375B9", -"/. c #708CB2", -"(. c #2F64B3", -"_. c #1B35AC", -":. c #252CA6", -"<. c #2130A9", -"[. c #1F32AB", -". . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . + ", -"@ # $ # % & * & & = - + - $ ; > ", -", - ' ) ! ~ { ] ^ . = / ( _ . : ", -"< [ } | 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 y z A B C D E F ", -"G H I J K L y M y N O P Q R S T ", -". U V W X Y Z ` ...+.@.#._ $.%.", -"&.*.=.-.;.>.,.'.).!.~.{.].^./.(.", -"_.:.. . :.:.<.[.<.# ; ; - - , , ", -":.. . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . ", -":.. . . . . . . . . . . . . . . "}; diff --git a/navit/navit/xpm/toilets.xpm b/navit/navit/xpm/toilets.xpm deleted file mode 100644 index 4bad215..0000000 --- a/navit/navit/xpm/toilets.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"16 16 2 1", -". c None", -"# c #000000", -"................", -"...#...##...#...", -"..###..##..###..", -"...#...##...#...", -"..###..##.####..", -".#####.##.#####.", -".#####.##.#####.", -".#####.##.#####.", -"#########.#####.", -".#####.##..###..", -"..###..##..###..", -"..###..##..###..", -"..###..##..###..", -"..###..##..###..", -".......##..#....", -"................"}; diff --git a/navit/navit/xpm/wifi.xpm b/navit/navit/xpm/wifi.xpm deleted file mode 100644 index 63be9bc..0000000 --- a/navit/navit/xpm/wifi.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * wifi_xpm[] = { -"13 15 3 1", -" c None", -". c #0000FF", -"+ c #000000", -" ..... ", -" . . ", -" . ... . ", -" . . . . ", -". . . .", -". . +++ . .", -". . +++ . .", -". . +++ . .", -". . + . .", -" . . + . ..", -" . + . ", -" .. + .. ", -" + ", -" + ", -" "}; -- 2.7.4