From bb16ed2a6540fd9b2ea2a796d0030a9698926d63 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 15 Dec 2011 11:16:14 +0000 Subject: [PATCH] - debian related changes --- mk/linux/megaglest.bmp | Bin 1146 -> 2118 bytes mk/linux/megaglest.xpm | 1880 +++++++++-------- source/g3d_viewer/CMakeLists.txt | 17 +- source/glest_game/CMakeLists.txt | 17 +- source/glest_map_editor/CMakeLists.txt | 17 +- source/shared_lib/include/graphics/texture.h | 5 + .../shared_lib/sources/graphics/texture.cpp | 25 +- .../sources/platform/sdl/gl_wrap.cpp | 39 +- 8 files changed, 1107 insertions(+), 893 deletions(-) diff --git a/mk/linux/megaglest.bmp b/mk/linux/megaglest.bmp index c08947a92410d9ee675ba065bb4f467aa8f23ee9..294f0721e2447aae5b5a50d0345768651a4deeac 100644 GIT binary patch literal 2118 zcmXX{e@q+a88+Y;v}P$%Dz%X|6^w20)JeHXk@o$^XY9aP%2Y0uHZK3bcNEB_QWtxZ zLN8M>XY*sEgcPQg0v+K#L%RZDOF*fbL=@i{+KIr@uoNjF!T9W?BQyJ>kVJIe`;p%1 z?!Mpe^SkWSAQh-mO2i1P>wsQ~=n%rNqDiIl0$DjHk^EqUGzcE9LA1MX(lE>rz{`*m zw9n7*@ADUfSM_MFC{gBcS8zFQhJQ+W7Ny{2u{%+u<5VC~UF<$KSWlwzdYOikyfdg_ zt6zgtRIKqMge*FDT$%c9i6&%||M`iPvsORE15Qu!6wk|XSw%N#sS+kCVmoz}&$twV zTCo?kto%3p`FqVX*X#cmIW+%v1~2|OYW26m*&5b)ou{ZQNQj5qqN#upDCUy<2H%SF zxTZ{FN+XVc-8r${cVy^%xO1_#cjkBfLt$~?S?;;kzz#3ZLMt?Xm^!h~YH63h7C<&)fO!uCcyc#_>VWx@{i@)A&A*(~#tT17@#yl9o8?awR>A;(!gu1C6a^`_E zb->jMv2VFNb2ghrGvT!>=LYWF%DOVW;g2$ZNsk$T4OzjC4mc%b$i+lLg%g#)3?1;d zg7p~0w)WHeH?rBk4cbX<%1&>cTa7B2GdDJs*#R9}1qXO(^{dFkF?JZZaKex)l^8^y zMV8$ym+!^1*_UQ4qTln2p^EX^6@0H1b7_- z{Ix5`0so=VBEwzWF0L0PigLx(x5^iRS9}b-)WN>SR3U1Be~H?HUa=Lj(hB@z^L8O- z{PfPd>4;KyJ;&lHC@vV02WE=&TtSB%KgX#9ih9unc9$rXOBL2$R542|bOWt> za~1w1DbI$k*xd|+6;#@!mMSXl9<+<~B0)|e#*g5OpN?$jiVqH}d!B%z0O<(Cw!Po| z#m_!_)Dkjc0c}rzDvA(Orodl9qQvB#P!CGP#N!B@#bUrz_?(d%_FX7=fyH*JoIlZvZ zH2d1Z;e`?WZOa?8mwI}dzV0~qei&_y$Je~mm}ydxkXM-B9NVqj%oF18k3O^BVjdVF zdyVU1blBFp|6$>BxaRGtm#+G1J}$r1{F^i8;brRVGgA^WsdHyTjq&qI+ug=wp6H9k zpIN^G^mR!-5^`->Puu#x9e(kf%H|)14qn}C>3aRhnO~oALjAbdYs>g1QmN?T(Ue!5 z-;96lx*Ox`-$^~&m+(C@pF~5^=F%q(SKFul`0;^-hLa6-`>HSWy!^o{J-0gS+$5cs zZRw*sF}3YKaWknk-fi4W{X@s~a`Y?nsqbm>fmEmR1*`d6?&ba899VwXaekPadSm$I zoQjX!amD2CWb`1@51PWoQ1g^ptZnS|V9H}v@S)~mj z4YhSK-F4Fnv0iP7U{p;4iE88m4jKE4>lO530b(vB&MZCux=95e-?D^?)k3k;Fh1XslF`fLU_`Wx+4I%z!P}M)C&3 zpnrz|JnqUB^Mmv9sH}EX8ctZr{(okG%2W=6mO!g&jz~ya9wSDe3EEYPU2G!+1*ZRL wWatttoT#2&qLX{A_vqF*H{Cs0I5A1NX>PiDnzgpZ1^8}_KObj1mS}$P|GaO}7XSbN literal 1146 zcma)+|4-C)9LFCZsEC{#9B^+YJwl?NNC+C%1S29I6S*oubG1pZ+JmMP^28gQ{*NA9SK05!SlxlSwu>}( zE1R31C9|;?{l0cgwO%ZBUi9vRq}Oy|tAB=KPbb!@R*V(Zq&do{_Dvvvs+L%7774}M zF_^Q7Q&}NWCl2=@Yw3ghJ+LmBxxsFH-X_8{8R(p47`8XCe>i}=d_OW}8W#T~x$m6^ zcQ*}(`?+)f20uNz#bxOMAAG+=@iD(hERIdqLTn{2bh{4F=no)sHIrh?CoVOU&>f8= zjh{sNW{$oyXTZ1v3d)fFxs77zeZrJxlJm;Yooc{LwDg>p|Ps_Y`-ECnF5bLG1` zNdNv$-q$x7`uRt$+`oq;No?>8A=l@iag?L5=A*Cbz$5URJV#L49YmY5L7B(WZ-24; z@F6&Mk|a2k_s$SKJS*7Vh|G|STI`SA>|Eiu@s&vu+?}jTv9KxKA@0{xFuj1Ze3N2t zJA|sK*;~cY#jB7~K$6u-eC8HXa!N4ObkHd98xOopqAeGNA)5$=p5159(f9dBd?GO4 z781mM?T;T&zCMall}eIDU@vlEuIr|G_$^{wEkvobL?)WZUigCJmlh$}0vRr_m4nVq zXr7O-^UE+YAh^m!Q@RavLyx#WKzwN(az!c$V;{n?8P=~2CuBV+^clpP?4%poD2hBQ z-t`iZ6)rXwnhDR!BHi6i$GJ;r=03)0%c1w(X&f(Jpzzc^)MZszw@6scS4p-WA<5Lo zAb(S$dY-w6i;S)vWFYG$nga`je|nji@i$OU1+aJ*$(#HW?ao0mt0c7c!>G+YXxBWz z8+w;QosV|;NoIM0Hx>Oned28rzWNrc;K+3GI;9sRa{aeRb2_k=OX$^)(H3;GRrUy< zD7HgUpK&yHp2ysv!RW;!_?Nx*4*FkyB`PJ3E!QM+hOQGKYBk<&Akm&mNCre?s!?S) z2si4%nMz_wCB}V+sP~_S>P}=6vqWu(B60dIrdPitJhzz0T?dJ%Xd=3@o|Go>E4b=l zn;Turb3}_;wbXS6OIT_hpTTqDG;Jc6`jJ^YWAg%6fEHo5j7-rnHbvLO{EFT-Iz_AS K1@qoJFv5Q(>=3U2 diff --git a/mk/linux/megaglest.xpm b/mk/linux/megaglest.xpm index b5a30921..0484adfa 100644 --- a/mk/linux/megaglest.xpm +++ b/mk/linux/megaglest.xpm @@ -1,879 +1,1007 @@ /* XPM */ static char * megaglest_xpm[] = { -"48 48 828 2", +"32 32 972 2", " c None", -". c #B5AD94", -"+ c #CDC797", -"@ c #D1CBA0", -"# c #B5AD8E", -"$ c #B6AD94", -"% c #BBAF96", -"& c #BFB69F", -"* c #B4A78C", -"= c #AA9F86", -"- c #AEA38A", -"; c #857D55", -"> c #756440", -", c #786339", -"' c #857249", -") c #7C6B3C", -"! c #6C531D", -"~ c #6B521B", -"{ c #614B1A", -"] c #766132", -"^ c #7D6B42", -"/ c #5E4207", -"( c #593D00", -"_ c #725B2A", -": c #634911", -"< c #6A5420", -"[ c #89754A", -"} c #7E693A", -"| c #4A3A1A", -"1 c #645328", -"2 c #52421C", -"3 c #908125", -"4 c #94852B", -"5 c #5A4313", -"6 c #6C572A", -"7 c #6B5D3B", -"8 c #625436", -"9 c #8C7922", -"0 c #D4B440", -"a c #D7BA44", -"b c #968240", -"c c #523D0E", -"d c #5C4A21", -"e c #5A4B28", -"f c #221A08", -"g c #72663E", -"h c #B18D07", -"i c #544927", -"j c #AC9F1F", -"k c #E1DE32", -"l c #6D5713", -"m c #6F5B31", -"n c #B4900B", -"o c #D0AC39", -"p c #FEA63E", -"q c #FC933D", -"r c #B29147", -"s c #48350C", -"t c #5A4D30", -"u c #322A19", -"v c #A6997C", -"w c #664718", -"x c #6E603A", -"y c #CFC930", -"z c #FDF133", -"A c #C2BA30", -"B c #685423", -"C c #655430", -"D c #837628", -"E c #F3BE3E", -"F c #FFA13D", -"G c #FE923B", -"H c #B6943F", -"I c #846F42", -"J c #2A2417", -"K c #6C4E10", -"L c #E9D72A", -"M c #FFF32F", -"N c #E8E92E", -"O c #58521C", -"P c #2B2310", -"Q c #292110", -"R c #AC9A2C", -"S c #FEA93A", -"T c #FF933B", -"U c #A17E28", -"V c #3B3016", -"W c #2A2008", -"X c #312710", -"Y c #3B3220", -"Z c #2F240E", -"` c #604C0A", -" . c #F3DC27", -".. c #FBEF32", -"+. c #FDEC32", -"@. c #AFAB25", -"#. c #4A3C20", -"$. c #59501A", -"%. c #ECC839", -"&. c #FFAA3B", -"*. c #FF943D", -"=. c #BB852D", -"-. c #4B3A20", -";. c #493B20", -">. c #4A3E22", -",. c #39290B", -"'. c #4F4329", -"). c #3C290B", -"!. c #493E22", -"~. c #342607", -"{. c #3A2D0F", -"]. c #2B2312", -"^. c #897132", -"/. c #827312", -"(. c #FBE030", -"_. c #D4C525", -":. c #F1E02E", -"<. c #E8DC28", -"[. c #7C7423", -"}. c #423210", -"|. c #ADA12E", -"1. c #FCAC3A", -"2. c #FCA83A", -"3. c #D3902E", -"4. c #5E4E28", -"5. c #4E4224", -"6. c #594727", -"7. c #4C3D21", -"8. c #5D3013", -"9. c #4F3D22", -"0. c #603325", -"a. c #B82166", -"b. c #A31158", -"c. c #88424D", -"d. c #4A3A1B", -"e. c #534726", -"f. c #3B3018", -"g. c #B8B137", -"h. c #FDE230", -"i. c #9C8A1E", -"j. c #AB9C26", -"k. c #F1E531", -"l. c #BDBA25", -"m. c #624E23", -"n. c #E5C537", -"o. c #EDAE35", -"p. c #E88E33", -"q. c #FFA23F", -"r. c #E28637", -"s. c #5D4F28", -"t. c #5B4B2A", -"u. c #514223", -"v. c #9A4625", -"w. c #B35128", -"x. c #C53127", -"y. c #B33326", -"z. c #A1362A", -"A. c #863A26", -"B. c #534223", -"C. c #7A412F", -"D. c #B92945", -"E. c #E12E67", -"F. c #D73062", -"G. c #C7154D", -"H. c #D8026B", -"I. c #CA037A", -"J. c #A42159", -"K. c #3E2F11", -"L. c #523A2D", -"M. c #A22675", -"N. c #CD10B7", -"O. c #DD0BD3", -"P. c #BA08CE", -"Q. c #A22DA2", -"R. c #674223", -"S. c #7E6A42", -"T. c #D2CD32", -"U. c #FFF331", -"V. c #E0D52C", -"W. c #746718", -"X. c #D1C92A", -"Y. c #F0D22F", -"Z. c #D1AB2E", -"`. c #F7C439", -" + c #A87F20", -".+ c #D68532", -"++ c #F48D38", -"@+ c #EC8935", -"#+ c #513F1C", -"$+ c #463A20", -"%+ c #5E4623", -"&+ c #8C5825", -"*+ c #CF4F2A", -"=+ c #FA422E", -"-+ c #FD2B2A", -";+ c #FC2928", -">+ c #F01F22", -",+ c #8B2516", -"'+ c #483115", -")+ c #423415", -"!+ c #7A3529", -"~+ c #E92244", -"{+ c #FA003A", -"]+ c #EA014D", -"^+ c #E80152", -"/+ c #E40060", -"(+ c #D9006B", -"_+ c #D0017A", -":+ c #A01553", -"<+ c #632F34", -"[+ c #B20C86", -"}+ c #C40396", -"|+ c #BC02B3", -"1+ c #B601BB", -"2+ c #9900BF", -"3+ c #9D01C9", -"4+ c #8D0EB1", -"5+ c #553C2E", -"6+ c #4E3706", -"7+ c #665928", -"8+ c #E2E12D", -"9+ c #F5DA2B", -"0+ c #ECE028", -"a+ c #D4BC2B", -"b+ c #978722", -"c+ c #EDD031", -"d+ c #F7CB36", -"e+ c #D7B02E", -"f+ c #5D4822", -"g+ c #DA8C37", -"h+ c #FAA23A", -"i+ c #CE7B2D", -"j+ c #F4943F", -"k+ c #5B4922", -"l+ c #4A3D21", -"m+ c #694E26", -"n+ c #E56F38", -"o+ c #FD5832", -"p+ c #F74628", -"q+ c #E02D27", -"r+ c #F52A28", -"s+ c #FE1F2E", -"t+ c #E71F25", -"u+ c #8C3628", -"v+ c #462C14", -"w+ c #D22841", -"x+ c #FD003B", -"y+ c #DB0A31", -"z+ c #A01C30", -"A+ c #871C30", -"B+ c #CA0763", -"C+ c #C20864", -"D+ c #7A263F", -"E+ c #761944", -"F+ c #AE0E79", -"G+ c #781D45", -"H+ c #5F2F36", -"I+ c #7D1D6C", -"J+ c #A102B7", -"K+ c #9D00C5", -"L+ c #8900C8", -"M+ c #770E8F", -"N+ c #47340F", -"O+ c #231800", -"P+ c #BC9E0D", -"Q+ c #F2DD2F", -"R+ c #D2CB34", -"S+ c #928F26", -"T+ c #EBEB31", -"U+ c #BAB725", -"V+ c #DDBD2F", -"W+ c #F1D730", -"X+ c #8B7A24", -"Y+ c #554322", -"Z+ c #DE9338", -"`+ c #F19E3B", -" @ c #D0722E", -".@ c #F8943B", -"+@ c #5C3D10", -"@@ c #64431E", -"#@ c #EB6731", -"$@ c #FE5832", -"%@ c #EE4628", -"&@ c #D52D27", -"*@ c #F02725", -"=@ c #F91F23", -"-@ c #DC2C2F", -";@ c #613823", -">@ c #6B4028", -",@ c #F00D35", -"'@ c #F6053C", -")@ c #AD122A", -"!@ c #E6024B", -"~@ c #BA1238", -"{@ c #971B40", -"]@ c #D90075", -"^@ c #C60673", -"/@ c #752A3D", -"(@ c #4C321B", -"_@ c #56342D", -":@ c #4E2128", -"<@ c #87116F", -"[@ c #A10C9E", -"}@ c #9803B7", -"|@ c #9701BB", -"1@ c #9001C4", -"2@ c #9E0CB3", -"3@ c #604150", -"4@ c #978E22", -"5@ c #F6EA2C", -"6@ c #A49522", -"7@ c #A6A029", -"8@ c #E4E525", -"9@ c #F2DC2E", -"0@ c #B0AB1F", -"a@ c #433110", -"b@ c #594620", -"c@ c #E0953A", -"d@ c #DB9035", -"e@ c #E07C35", -"f@ c #FB9840", -"g@ c #825B25", -"h@ c #5C421F", -"i@ c #BB6A2E", -"j@ c #FE7336", -"k@ c #FF5033", -"l@ c #E34527", -"m@ c #A23224", -"n@ c #843223", -"o@ c #793826", -"p@ c #6B3724", -"q@ c #6D3D29", -"r@ c #F4082D", -"s@ c #EB092A", -"t@ c #711B17", -"u@ c #E00E4E", -"v@ c #A81831", -"w@ c #912644", -"x@ c #D90166", -"y@ c #D5007D", -"z@ c #92214D", -"A@ c #47381A", -"B@ c #862154", -"C@ c #B20793", -"D@ c #AF098F", -"E@ c #871C6E", -"F@ c #52105A", -"G@ c #7E0A8C", -"H@ c #7305B3", -"I@ c #7B01C6", -"J@ c #733784", -"K@ c #D3D02B", -"L@ c #EAE92C", -"M@ c #725A14", -"N@ c #ADA927", -"O@ c #D8D630", -"P@ c #635A23", -"Q@ c #5C4F20", -"R@ c #DE953C", -"S@ c #CF852C", -"T@ c #F48F34", -"U@ c #FC9438", -"V@ c #94692C", -"W@ c #5B3A12", -"X@ c #E55F2E", -"Y@ c #FF5533", -"Z@ c #D34022", -"`@ c #513B22", -" # c #543114", -".# c #DF0B29", -"+# c #F20440", -"@# c #61341E", -"## c #573525", -"$# c #504527", -"%# c #C41057", -"&# c #DB0076", -"*# c #D60182", -"=# c #812639", -"-# c #5A323A", -";# c #D20696", -"># c #C100A8", -",# c #950D6C", -"'# c #3C280F", -")# c #36152F", -"!# c #9E04B9", -"~# c #8304B8", -"{# c #8C00CC", -"]# c #782497", -"^# c #A7985E", -"/# c #EFF02B", -"(# c #C0B82B", -"_# c #423519", -":# c #5F522F", -"<# c #6A601D", -"[# c #3C3320", -"}# c #5F5125", -"|# c #E7953C", -"1# c #FA9D39", -"2# c #FF983D", -"3# c #FE8A3C", -"4# c #A67B2E", -"5# c #473A1C", -"6# c #805E34", -"7# c #DD5D2C", -"8# c #FE5432", -"9# c #F74A27", -"0# c #9D2D1C", -"a# c #4A3A1F", -"b# c #4D3A20", -"c# c #853729", -"d# c #99332B", -"e# c #4D2911", -"f# c #8D171F", -"g# c #F30536", -"h# c #CB092F", -"i# c #921E27", -"j# c #B41041", -"k# c #EF015A", -"l# c #CC0280", -"m# c #5F2E23", -"n# c #5B3134", -"o# c #C60389", -"p# c #C500A7", -"q# c #B2079F", -"r# c #4A2E1B", -"s# c #34192A", -"t# c #9410A4", -"u# c #754369", -"v# c #7507C4", -"w# c #8130A8", -"x# c #D5B455", -"y# c #E6DC2C", -"z# c #92803E", -"A# c #ACA382", -"B# c #E5E89E", -"C# c #BBD0D1", -"D# c #635722", -"E# c #EB9D3F", -"F# c #FEA53C", -"G# c #FD973C", -"H# c #FB8B38", -"I# c #A47926", -"J# c #443412", -"K# c #5D4825", -"L# c #7F4D26", -"M# c #C5502C", -"N# c #FC3E2E", -"O# c #F5302A", -"P# c #E02B27", -"Q# c #DE2C2B", -"R# c #EC2030", -"S# c #D62437", -"T# c #3A2A18", -"U# c #463418", -"V# c #9D2B32", -"W# c #E11B4D", -"X# c #E0044A", -"Y# c #DA0648", -"Z# c #D70364", -"`# c #C50680", -" $ c #523017", -".$ c #4A3925", -"+$ c #A80E73", -"@$ c #C7029E", -"#$ c #BB03B3", -"$$ c #781A56", -"%$ c #581163", -"&$ c #9107B7", -"*$ c #8D169A", -"=$ c #9320BB", -"-$ c #8D6374", -";$ c #BB9D31", -">$ c #A99B3A", -",$ c #D7C01F", -"'$ c #F4F6D8", -")$ c #E6E369", -"!$ c #574A20", -"~$ c #AA9934", -"{$ c #B79B37", -"]$ c #A48834", -"^$ c #876A2C", -"/$ c #554423", -"($ c #732B13", -"_$ c #D94027", -":$ c #C4302A", -"<$ c #E52A2E", -"[$ c #D32B27", -"}$ c #A33229", -"|$ c #952E21", -"1$ c #4F2B0F", -"2$ c #4B2C16", -"3$ c #463719", -"4$ c #4F2B16", -"5$ c #69372B", -"6$ c #6B2F29", -"7$ c #B40B51", -"8$ c #BE106E", -"9$ c #442C13", -"0$ c #51372B", -"a$ c #992770", -"b$ c #BC14A4", -"c$ c #B118A6", -"d$ c #8E1295", -"e$ c #9B3696", -"f$ c #7E445D", -"g$ c #826B51", -"h$ c #7E5F31", -"i$ c #CCA72E", -"j$ c #E1A903", -"k$ c #DDCE16", -"l$ c #423821", -"m$ c #524428", -"n$ c #413216", -"o$ c #413210", -"p$ c #663E25", -"q$ c #7D3522", -"r$ c #693721", -"s$ c #483B20", -"t$ c #953332", -"u$ c #C22F44", -"v$ c #5E402B", -"w$ c #493C21", -"x$ c #592116", -"y$ c #D00461", -"z$ c #DA0071", -"A$ c #9C2350", -"B$ c #46381A", -"C$ c #4D4127", -"D$ c #3E331C", -"E$ c #433619", -"F$ c #3A2A0D", -"G$ c #D89904", -"H$ c #493B1F", -"I$ c #483B1E", -"J$ c #38290C", -"K$ c #493C20", -"L$ c #842923", -"M$ c #F1223C", -"N$ c #CD283F", -"O$ c #643423", -"P$ c #562D10", -"Q$ c #C2134C", -"R$ c #DE0068", -"S$ c #DB0875", -"T$ c #5B3D29", -"U$ c #645430", -"V$ c #B08C07", -"W$ c #3F3013", -"X$ c #43351A", -"Y$ c #BB8308", -"Z$ c #D69003", -"`$ c #EBE951", -" % c #4A3B1F", -".% c #504223", -"+% c #BB2C3D", -"@% c #FB0F45", -"#% c #F00349", -"$% c #E40350", -"%% c #EC0059", -"&% c #F20172", -"*% c #A1254E", -"=% c #433516", -"-% c #403115", -";% c #493B1D", -">% c #EDCC01", -",% c #DDA204", -"'% c #4B3B1B", -")% c #423416", -"!% c #4E3F22", -"~% c #4D391F", -"{% c #95383D", -"]% c #A93242", -"^% c #A9324D", -"/% c #A8314F", -"(% c #8E3444", -"_% c #4E4329", -":% c #FCEA02", -"<% c #6D550C", -"[% c #443413", -"}% c #4A3B20", -"|% c #C5A333", -"1% c #E8EBA8", -"2% c #E0E389", -"3% c #E7E572", -"4% c #F8E101", -"5% c #B38809", -"6% c #312913", -"7% c #4B3F23", -"8% c #DFE184", -"9% c #F0F2C2", -"0% c #928663", -"a% c #4D4023", -"b% c #AB8807", -"c% c #C08007", -"d% c #987E06", -"e% c #7C6815", -"f% c #C98305", -"g% c #877832", -"h% c #464740", -"i% c #A7C3DD", -"j% c #4E4024", -"k% c #F7E604", -"l% c #8D7224", -"m% c #846E39", -"n% c #7E693B", -"o% c #A89743", -"p% c #9E8D47", -"q% c #6B8098", -"r% c #13182D", -"s% c #453617", -"t% c #48391D", -"u% c #4B3D22", -"v% c #47391C", -"w% c #464741", -"x% c #5D7CA0", -"y% c #E7E556", -"z% c #957A09", -"A% c #647D98", -"B% c #A9C2D9", -"C% c #CDE7F3", -"D% c #DEF5FC", -"E% c #E6F7FE", -"F% c #EFFAFE", -"G% c #D8F2FA", -"H% c #C2DEE7", -"I% c #B7CBCD", -"J% c #669FF2", -"K% c #E5BA02", -"L% c #9B8205", -"M% c #493D20", -"N% c #44371B", -"O% c #3C3118", -"P% c #45515F", -"Q% c #C4E2EE", -"R% c #FBFEFE", -"S% c #EBEFB4", -"T% c #E7E56D", -"U% c #E6E264", -"V% c #E0E493", -"W% c #C8E6F1", -"X% c #A0CCF3", -"Y% c #A48504", -"Z% c #4C3F25", -"`% c #332915", -" & c #413211", -".& c #46391D", -"+& c #62471B", -"@& c #587AA9", -"#& c #DAF3FB", -"$& c #7DBCFD", -"%& c #B68609", -"&& c #F3D701", -"*& c #E3B102", -"=& c #79663A", -"-& c #598DD4", -";& c #4D5558", -">& c #473B20", -",& c #46340F", -"'& c #F4FCFE", -")& c #93C6F7", -"!& c #6B5517", -"~& c #271E0C", -"{& c #110C0A", -"]& c #170F09", -"^& c #634A13", -"/& c #98844B", -"(& c #41371F", -"_& c #8F731E", -":& c #434232", -"<& c #20190C", -"[& c #44381E", -"}& c #332913", -"|& c #48310A", -"1& c #80BFFB", -"2& c #504123", -"3& c #46391E", -"4& c #332506", -"5& c #392B0D", -"6& c #96C7F6", -"7& c #151A2F", -"8& c #7D8FA8", -"9& c #5E5233", -"0& c #2E2410", -"a& c #5A8ACE", -"b& c #4E4228", -"c& c #3E3216", -"d& c #3A2D12", -"e& c #4E3D1D", -"f& c #AFC2D0", -"g& c #434E58", -"h& c #919EB2", -"i& c #877137", -"j& c #E5C101", -"k& c #CF8A04", -"l& c #3F331B", -"m& c #332B19", -"n& c #483A14", -"o& c #BED9E2", -"p& c #B3C6CC", -"q& c #1D140A", -"r& c #B1A13D", -"s& c #C38006", -"t& c #776231", -"u& c #C0A037", -"v& c #908054", -"w& c #715D2E", -"x& c #453A22", -"y& c #3A2E16", -"z& c #322C20", -"A& c #4E4020", -"B& c #483A1D", -"C& c #A6C5E2", -"D& c #889AB1", -"E& c #6E5817", -"F& c #7A673C", -"G& c #70849F", -"H& c #A08304", -"I& c #39301B", -"J& c #4B3E23", -"K& c #4D3E1E", -"L& c #3B2B0D", -"M& c #758AA5", -"N& c #F9E904", -"O& c #75B2FB", -"P& c #F2F4CC", -"Q& c #E4E478", -"R& c #F6F649", -"S& c #8598B0", -"T& c #5A8EDC", -"U& c #423211", -"V& c #3E331D", -"W& c #42361B", -"X& c #9B8949", -"Y& c #41361B", -"Z& c #241901", -"`& c #554C21", -" * c #493A1F", -".* c #47381B", -"+* c #577FB3", -"@* c #9BA2A8", -"#* c #89C3FA", -"$* c #A89D7C", -"%* c #443515", -"&* c #392C10", -"** c #A2830A", -"=* c #857347", -"-* c #4A3F21", -";* c #4B3E21", -">* c #4F4022", -",* c #8193AA", -"'* c #96A0AF", -")* c #A2C9ED", -"!* c #120E11", -"~* c #12121E", -"{* c #EEDE09", -"]* c #79B7FD", -"^* c #A49776", -"/* c #3A2E13", -"(* c #756924", -"_* c #E2D40F", -":* c #8DC4F9", -"<* c #B7A03B", -"[* c #A6A495", -"}* c #639AEF", -"|* c #43371F", -"1* c #5D8EE7", -"2* c #A1A39F", -"3* c #3D2D10", -"4* c #453513", -"5* c #43371C", -"6* c #B3AC87", -"7* c #322918", -"8* c #F0EE4C", -"9* c #4C3C1D", -"0* c #70ACF9", -"a* c #6095EC", -"b* c #959A58", -"c* c #A5B2B0", -"d* c #3F2F0F", -"e* c #453516", -"f* c #3E2F12", -"g* c #4B3D21", -"h* c #473A20", -"i* c #AC9F83", -"j* c #2E250F", -"k* c #4A3E21", -"l* c #504121", -"m* c #E4E15E", -"n* c #59728E", -"o* c #B1C4C6", -"p* c #A9B7B6", -"q* c #3A2B0E", -"r* c #3B2B0E", -"s* c #A99D82", -"t* c #1A1303", -"u* c #372D15", -"v* c #4E4227", -"w* c #47391E", -"x* c #3F3319", -"y* c #3D3115", -"z* c #3D2E11", -"A* c #463B22", -"B* c #3C3217", -"C* c #E8DA0B", -"D* c #93770E", -"E* c #6F5821", -"F* c #382D17", -"G* c #3C321C", -"H* c #4A5868", -"I* c #382C13", -"J* c #463B21", -"K* c #3C3017", -"L* c #40341B", -"M* c #494332", -"N* c #191203", -"O* c #483E30", -"P* c #515040", -"Q* c #655A40", -"R* c #1A1807", -"S* c #685D3E", -"T* c #6D5D33", -"U* c #5B5738", -"V* c #473F28", -"W* c #3C3C2B", -"X* c #3F423A", -"Y* c #1C292A", -"Z* c #23180D", -"`* c #101004", -". + @ # $ % & & & * * % % & & * & & & & = % % * & & & & & . = % % & & % % - - % % * * % & % ; > ", -"% , ' ) ! ~ { ] ' ^ / ( ( ~ _ ( ( : , ' < , [ / _ } } ^ ^ [ } _ _ [ [ ] , ] _ } _ ~ , ~ ~ ^ ] | ", -". 1 2 1 3 4 5 6 , 7 8 > 9 0 a b < < c 8 1 < [ < < < d | 5 ' [ < ( ( 6 7 8 > _ ' , ( } ' c e 7 f ", -"- g h i j k l m > i n 8 o p q r [ , s n i : < ~ : m e n t ' ' } _ : : i n 8 ^ [ [ ~ _ ' e n 8 u ", -"v 5 w x y z A B C 2 | D E F G H } _ d 8 7 ] } } < ' > 2 m ] ~ I [ ] : 5 s c ' [ I _ _ ] m 8 d J ", -"* m { K L M N O P Q Q R S F T U V W W u W X Y u u X W W u W X Y Z V Y Y W u Y Z W u Q ~ 5 m { Q ", -"% ' < ` ...+.@.#.V $.%.&.F *.=.-.;.V >.V ,.'.;.;.;.V ,.>.,.,.'.V V ).!.>.V '.>.~.{.].} ^.} ' u ", -"* ' 6 /.(._.:.<.[.}.|.1.2.F T 3.4.5.i i 6.7.8.9.>.e e }.i | }.e e 0.a.b.c.,.d.e.>.>.f.' _ { 6 u ", -"= I I g.h.i.j.k.l.m.n.o.p.q.T r.s.t.u.u.v.w.x.y.z.A.B.i i C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.c c Q ", -"* ] S.T.U.V.W.X.Y.Z.`. +.+p ++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+d f ", -"* 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+", -". 2 P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@;.@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@Q ", -". > 4@5@6@u 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@Q ", -"= ] K@L@M@X >.N@O@P@;.Q@R@S@T@U@V@}.W@X@Y@Z@`@;.;.'.;. #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#W ", -"* ^#/#(#: 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#f ", -". x#y#z#_ Z V 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#&#`# $.$+$@$#$$$%$&$*$=$-$Q ", -". ;$>$[ ] W W ,$'$)$,.!$~${$]$^$/$;.;.;.($_$:$<$[$}$|$1$2$3$4$5$6$7$$9$,.0$a$b$c$d$e$f$g$I Q ", -"% h$, ' , V _#| i$j$k$}.l$u.m$;.n$;.;.,.o$p$;.q$r$;.s$t$u$v$;.w$x$y$z$A$}.B$C$l+D$E$u < < ' ' f ", -". 1 2 1 ^ Y '.'.F$| G$,$H$I$J$~.K$}.,.,.}.;.;.u.}.;.}.L$M$N$O$P$Q$R$S$T$>.}.;.u.$+l$u / c e U$f ", -"- | V$2 ' u '.'.W$X$Y$Z$`$;.>.3$;.;.>. %}.}.;.,.}.}.'..%+%@%#%$%%%&%*%=%i$}.}.;.-%;.u { 2 n t Q ", -"* d | d < W '.| ;%}.}.Y$>%,%'%,.,._#,.)%,.u.>.>.!%}.}.;.~%{%]%^%/%(%_%:%<%;.l$'.l+>.u ] 1 t > u ", -". _ , ] : W _#i | [%;.;.}%|%1%2%3%}.;.B$}.;.;.}.;.l$}.;.;.,.l$$+'.4%:%5%6%;.;.;.7%>.u [ } , , Z ", -". _ I , , u _#,.i V }.,.,.B#8%9%0%;.;.a%>.b%j$j$Z$Z$c%d%,.}.e%:%>%f%4%;.,.;.;.w$#.;.u < I _ } u ", -"* < } } [ V V | | }.;.;.,.g%B#h%i%j%,.k%:%G$l%m%n%o%p%i$f%Z$j$q%r%:%,.s%;.;.t%u%$+v%u ~ } / / u ", -"- ~ I _ } u V u.u.}.;.,.,.}.'.w%x%y%:%z%A%B%C%D%E%F%G%C%H%I%I%J%K%L%u.M%>.;.}.;.;.N%u } } } < X ", -"- / _ I ] u V _#'.V ;.;.;.;.;.O%k$j$P%Q%R%E%S%T%U%V%W%Q%R%R%X%Y%>%| ,.'.K$Z%`% &;..&u I _ } } u ", -". ] 6 ] _ Y _#_#>.X +&;.;.,.}.k$K%@&#&R%$&%&&&K%K%*&Z$=&-&R%;&j$;.'.'.;.;.;.;.>&D$E$u ' _ ] < W ", -". > 8 d / V ;.;.}.[#,&;.;.;.}.4%P%'&R%)&!&:%~&{&{&{&]&^&/&W%Y$5%}.;.;.u.i ;.,.}.$+(&u ] d 8 > Q ", -"= 2 n 8 < Z '.,.,.$+}.;.;.,.>%_&)&R%R%P%:%:&~&<&[&}&}&|&|%1&j$;.;.;.,.,.,._#}.2&-%3&X ] 2 n 8 u ", -"= c U$> , X 4&t 4&5&,.;.;.;.K%q%R%R%6&j$L%7&8&9&~&0&}&|&|%a&>%}.;.;.;.;.;.u.;.b&D$c&X m 5 2 U$Q ", -"% < 6 } _ V >.>.,._#d&e&;.,.Z$f&R%R%B%>%|&g&P%h&i&b%j&*&k&;&4%;.}.}.,.,.}.,.;.u.;.l&Q 6 ~ , , W ", -"& I [ [ < Y >.i ,.| V m&H$n&f%o&R%R%p&G$q&0&r&:%&&s&t&u&v&w&K%}.;.;._#;.}.}.x&l+D$y&Q , _ I I z&", -"% _ } [ _ Y '.'.K.X$A&B&'.;.s&C&R%R%D&Z$E&k%j&F&G&X%o&F%F%H%@&j$H&;.;.u.i >.w$u.$+I&Q < < } I z&", -"* ( { [ _ W J&| ;.K&L&}.;.;.s&M&R%R%X%G$N&0%O&G%P&Q&R&S&o&R%R%T&K%}.;.,.u.'.U&;.-%V&J < < / : u ", -"% ] m 6 6 u _#i W&'.u.}.}.;.s&;&E%D%R%A%-&W%R&:%:%>%d%5%P%R%R%G%X&c%;.;.}.;.l$;.-%Y&X ^ , ~ ~ Q ", -"- U$e e ^ Z&`&'.}.}. *.*u.>.>.5%+*p&@*X%,$4%L%|&<&{&7&|&b%#*'&#&$*G$;.u.}.%*}.| >.&*Q ^ U$i > Q ", -"- i **| =*u '.'.-*;*>*}.}.;.}.:%g&,*h&'*)**&5%{&!*!*~*{*b%]*@*Q%^*j$>.;.}.u%u ;.;./*J ^ 2 V$8 u ", -". 7 (*d < W '.| ;%}.;.;.u._*:%:%4%a&h&@*@*:*<*4%&&_*:%k$'*,*[*}*K%d%;.>.u }.;.u.;.|*u > d | > u ", -". _ , ] : W _#i | [%;.;.R&R&<*;.;.4%A%1*@*2*S&A%A#b%^&a&'*C&$&%&:%V 3*;.=%4*Z%l+D$5*J > 1 c ~ J ", -"6*_ I ~ t 7*_#,.i }.8*R&o%9*}.,.;.| j&o%-&0*D&i%1*a*O&X%W%8%j&b*c*}.d*e*f*,.;.g*h*$+u > > : ( J ", -"i*: 1 U$d j*;.;.;.R&l%i k*l*>.;.;.'.'.G$:%m*V%S%I%B#V%R&:%:%X&n*o*p*>.}.,.q*,.r*>._#u U$> > { u ", -"s*/ 6 m d t*u*w$v*v*w*x*C$v%y*,.x*z*z*A*B*Y%j&_*C*_**&D*E*F*G*F*H*x%I%I*J*K*L*M*;.;.u I U$U$1 u ", -"* ~ _ I _ N*N*Y Y Y u W Y Y u Z Y Y O+W W u u N*f J J J f f u W z&A%+*p&Z u f f f f u ' _ c 6+Q ", -"% < 5 } ] ~ _ , < : ] , ' } _ [ [ } , , , _ ^ ^ ] ] m m 1 5 < ^ , ~ < M&f&1 1 m 2 O*,.P*;.Q*2 R*", -"- d s U$_ : < ' } 6+6+d } } _ _ < ^ 5 s U$< < [ } ( 2 2 U$< : _ I ] { S*D&T*{ , 6 1 U*V*Z u.U*f ", -"- i n U$^ _ / ] ' i n t ^ _ } I < , e n 8 , ( , ' 6 2 V$2 ^ , } ' } { U$n q%5 < 6 6 7 t W*_#'.R*", -"; 1 | 5 ' ' < < ' d s 7 I ] ] [ ] 6 6 i 7 ' _ _ [ ' > 8 d } _ / I I 5 c i 7 } _ < < > 8 ,.X*>.Y*", -"> ;.Q Q u u Q J u Q f J u u u u u J f f Q u Q f u u Q Q Q u u Q Q u u O+O+J J Q Q J J J Z*Z*Z*`*"}; +". 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/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index b6dc4c3f..1fa3f297 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -140,10 +140,19 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) IF(EXISTS ${HELP2MAN}) - MESSAGE("-- Found help2man: ${HELP2MAN}") - add_custom_target(${TARGET_NAME_MANPAGE} ALL - COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} - DEPENDS ${TARGET_NAME}) + MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}]") + + IF(EXISTS ${XVFB_EXEC}) + MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") + + add_custom_target(${TARGET_NAME_MANPAGE} ALL + COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} + DEPENDS ${TARGET_NAME}) + ELSE() + add_custom_target(${TARGET_NAME_MANPAGE} ALL + COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} + DEPENDS ${TARGET_NAME}) + ENDIF() ENDIF() ENDIF() diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 3a0c366a..7b2a3219 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -191,8 +191,6 @@ IF(BUILD_MEGAGLEST) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game) ENDIF() - FIND_PROGRAM(HELP2MAN "help2man") - SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) @@ -207,9 +205,18 @@ IF(BUILD_MEGAGLEST) IF(EXISTS ${HELP2MAN}) MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}]") - add_custom_target(${TARGET_NAME_MANPAGE} ALL - COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} - DEPENDS ${TARGET_NAME}) + + IF(EXISTS ${XVFB_EXEC}) + MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") + + add_custom_target(${TARGET_NAME_MANPAGE} ALL + COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} + DEPENDS ${TARGET_NAME}) + ELSE() + add_custom_target(${TARGET_NAME_MANPAGE} ALL + COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} + DEPENDS ${TARGET_NAME}) + ENDIF() ENDIF() ENDIF() diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index 39b2132c..d59e22cd 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -135,10 +135,19 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) IF(EXISTS ${HELP2MAN}) - MESSAGE("-- Found help2man: ${HELP2MAN}") - add_custom_target(${TARGET_NAME_MANPAGE} ALL - COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} - DEPENDS ${TARGET_NAME}) + MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}]") + + IF(EXISTS ${XVFB_EXEC}) + MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") + + add_custom_target(${TARGET_NAME_MANPAGE} ALL + COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} + DEPENDS ${TARGET_NAME}) + ELSE() + add_custom_target(${TARGET_NAME_MANPAGE} ALL + COMMAND ${HELP2MAN} -N -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME} + DEPENDS ${TARGET_NAME}) + ENDIF() ENDIF() ENDIF() diff --git a/source/shared_lib/include/graphics/texture.h b/source/shared_lib/include/graphics/texture.h index 12616d1f..96b0b892 100644 --- a/source/shared_lib/include/graphics/texture.h +++ b/source/shared_lib/include/graphics/texture.h @@ -21,10 +21,13 @@ using std::string; using Shared::Platform::uint8; using Shared::Platform::uint64; +struct SDL_Surface; + namespace Shared{ namespace Graphics{ class TextureParams; + // ===================================================== // class Texture // ===================================================== @@ -138,6 +141,8 @@ public: virtual int getTextureHeight() const {return pixmap.getH();} virtual uint32 getCRC() { return pixmap.getCRC()->getSum(); } + + SDL_Surface* CreateSDLSurface(bool newPixelData) const; }; // ===================================================== diff --git a/source/shared_lib/sources/graphics/texture.cpp b/source/shared_lib/sources/graphics/texture.cpp index ac6dec4d..a9595fd8 100644 --- a/source/shared_lib/sources/graphics/texture.cpp +++ b/source/shared_lib/sources/graphics/texture.cpp @@ -11,7 +11,7 @@ #include "texture.h" #include "util.h" - +#include #include "leak_dumper.h" using namespace Shared::Util; @@ -38,6 +38,7 @@ Texture::Texture() { forceCompressionDisabled=false; } + // ===================================================== // class Texture1D // ===================================================== @@ -66,6 +67,28 @@ void Texture1D::deletePixels() { // class Texture2D // ===================================================== +SDL_Surface* Texture2D::CreateSDLSurface(bool newPixelData) const { + SDL_Surface* surface = NULL; + + unsigned char* surfData = NULL; + if (newPixelData == true) { + // copy pixel data + surfData = new unsigned char[pixmap.getW() * pixmap.getH() * pixmap.getComponents()]; + memcpy(surfData, pixmap.getPixels(), pixmap.getW() * pixmap.getH() * pixmap.getComponents()); + } else { + surfData = pixmap.getPixels(); + } + + // This will only work with 24bit RGB and 32bit RGBA pictures + surface = SDL_CreateRGBSurfaceFrom(surfData, pixmap.getW(), pixmap.getH(), 8 * pixmap.getComponents(), pixmap.getW() * pixmap.getComponents(), 0x000000FF, 0x0000FF00, 0x00FF0000, (pixmap.getComponents() == 4) ? 0xFF000000 : 0); + if ((surface == NULL) && newPixelData == true) { + // cleanup when we failed to the create surface + delete[] surfData; + } + + return surface; +} + void Texture2D::load(const string &path){ this->path= path; if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] this->path = [%s]\n",__FILE__,__FUNCTION__,__LINE__,this->path.c_str()); diff --git a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp index 913b5626..692d0655 100644 --- a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp +++ b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp @@ -20,11 +20,16 @@ #include //#include #include "model.h" +#include "texture.h" +#include "graphics_interface.h" +#include "graphics_factory.h" +#include "platform_common.h" #include "leak_dumper.h" using namespace Shared::Graphics::Gl; using namespace Shared::Util; using namespace Shared::Graphics; +using namespace Shared::PlatformCommon; namespace Shared{ namespace Platform{ @@ -72,14 +77,28 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool #ifndef WIN32 string mg_icon_file = ""; #if defined(CUSTOM_DATA_INSTALL_PATH_VALUE) - if(fileExists(CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.bmp")) { + if(fileExists(CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.png")) { + mg_icon_file = CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.png"; + } + else if(fileExists(CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.bmp")) { mg_icon_file = CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.bmp"; } + #endif - if(mg_icon_file == "" && fileExists("megaglest.bmp")) { + if(mg_icon_file == "" && fileExists("megaglest.png")) { + mg_icon_file = "megaglest.png"; + } + else if(mg_icon_file == "" && fileExists("megaglest.bmp")) { mg_icon_file = "megaglest.bmp"; } + else if(mg_icon_file == "" && fileExists("/usr/share/pixmaps/megaglest.png")) { + mg_icon_file = "/usr/share/pixmaps/megaglest.png"; + } + else if(mg_icon_file == "" && fileExists("/usr/share/pixmaps/megaglest.bmp")) { + mg_icon_file = "/usr/share/pixmaps/megaglest.bmp"; + } + if(mg_icon_file != "") { if(icon != NULL) { @@ -87,7 +106,17 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool icon = NULL; } - icon = SDL_LoadBMP(mg_icon_file.c_str()); + //printf("Loading icon [%s]\n",mg_icon_file.c_str()); + if(extractExtension(mg_icon_file) == "bmp") { + icon = SDL_LoadBMP(mg_icon_file.c_str()); + } + else { + Texture2D *texture2D = GraphicsInterface::getInstance().getFactory()->newTexture2D(); + texture2D->load(mg_icon_file); + icon = texture2D->CreateSDLSurface(true); + delete texture2D; + } + //SDL_Surface *icon = IMG_Load("megaglest.ico"); @@ -105,6 +134,10 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool printf("Error: %s\n", SDL_GetError()); } if(icon != NULL) { + + //uint32 colorkey = SDL_MapRGB(icon->format, 255, 0, 255); + //SDL_SetColorKey(icon, SDL_SRCCOLORKEY, colorkey); + SDL_WM_SetIcon(icon, NULL); } }