From 892062b10b16f905915258c0ad0d3c5d89dc6444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Wed, 24 Jun 2020 18:09:18 -0700 Subject: [PATCH] Fixed VS build. --- tools/bin/linux/bin2c | Bin 88112 -> 88112 bytes tools/bin2c/bin2c.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bin/linux/bin2c b/tools/bin/linux/bin2c index 415240962b56275ec6a40b8cd4132ea19a9899b5..39015b9b40e20724f9d2af34db63527a281490d5 100755 GIT binary patch delta 11292 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 E0s82%2LJ#7 delta 11364 zcmai43s@6Z+MW}L1_dUmK%l4u7!?W@;-W%@e-i~6G%BvzYONXsZ(T33Lf3ZfCM-dX z7>yp?XxCP#z4&i!iyNbDfyRO}>oBum=W{`~C=bz_cX3qQF zzw@2TgwxolZfsP0;!*p$guOkqxriZ`Hh0~n!@742+uRy^Nw z!MXa@w?5wO)9M>!JjS)Gq$2+@kK+Mi~}F-p-*VbpiPg0+K%r5)h|)&71UCk z+*6NBdunuk1;vWT_tYnJNOEnDQLB6EOKh3cW`}~BolWrv3cOUpnUSFpc<>dl<&d-) z6jT$|Md}j_1F24vg4&49k@}L3EJ`g^P_vB`pRB;!ByBbY?#B(0daRAq=o|`)6`v(` zo~HWh6;!Ph*>(jk+iz6hZP*y4w=!!FyfoE@_xK@FC@LAAUs?+EU3W^^iEsP+^j!8kaVk1!fl3!K@wGo$T zq1q&0Yzk_&m-@0&ftRkPxJQA*3<0*XC0mUOYAL>_)#tUjsH|T>)&7yfW8037Hgy!3@l1jxZaINHzL4h~oD>{9GRbsaXO`X9;2QGs(&`6HY%tNjC$$q z?N&-{Q&5?C6u+pzt&)fB3f!=O@;^}EjyV)(Muq0wMD<{AFCEs#Y7z_zx}l89rQwDc zy*XP!&0a#OxeDB1rMO9f+i-G>zNBp-rCJqKM#|7!1#XgiNrBhnYS3nyOSO3vRD&e7 zNrC&Nj5aE86TT9oPhcb|zk&*LO{~5odo8uquAmw`6c-eD>FX5lP~dHNaV*%{NU7S< zp?%`O4PeVA=`<*)jO0VE0&kOWlLCjiCl2-m>!~fPg4%(NaeC~J)0k}vO7=@sVyP0B zs@$Q#+weND(^x^J>J?N!J{kw(%}S|$1=S!)olxNQGbn$X0{7!&z24rohEi?gLh~oj zQ%e=NJkL86xICY)RNx+IUh^pMQi|ifdR>V;_th(SsthK5%m>km{+*F|iRB(@F2Ebh0tHZ@Um zop;$=1RKb~yYK)io0!`Pa-uQgxx-}86La&4Iaf1Z>t~&dfqpm`4BB~DtFY}YhB3R2 z6MPEbyxYlX!6l3PAV-D*u<)*M&f*^23nCMaPXVYdpR>6B#k=lUT)Q|Nk&?BLQsgYkY7+{J*V3@1$ptw|*!g`8F>0?bkeZ^m;ZeD{2AGVdznG!{riI?%+N z%;yZkvKWS`o5*R3j3D}L!u%c+`^ia-a{;-i8lwi zc%TWv{~--0XA>DADB{HPVmQl)6QIcA`d$*X_ZUwD$`b=p*Q6$caO^G)9E-JxA#?5u&Sr51M_61}3L#LUl6P$p z?X);K266}0RLR*|3%RAl9GG>GCtN}r%P@|El!Y)g&LCB@(%8E40C5zSlbc8FPm zY*t+$%D%VMIYs?-t0i-H!2b5q-A-t!dBvcYXxx+z0QxyOMhj^mG>VXwU)f+}y{z3x4?p z7%GBaoEf!*-%fe*}#jRka_AA!;8uU()5#p}k zc<9+8BaF`ZoTBjOzeprTt@`M6sAMh z##Wqz)~O-Qe4+R(cXfFuXN_Ofrz>0KiaBQBoRCb z+r+y9M!y9n4MGHEJwO?C2ZmoeV2ogI0ZI*cpbdaKysNzr01M3RQix$d6^h}bh7QcX!+b{vW{nx9 zy+B{^SuVKGfdG3(4Rppx(Nn=DG;t3y(;=*YWF;E1;fvKf317@wg7%QrytskC+18*Rd{<&o$AW~9z6KB zF{=e);gP@KE%JRl__PWo;`O=TqB{Ii-gYz`CqDBe8i0p9^9joEsfO9Qp;f*m<{E^$ z;eQTai(bYnMyyqR|0RwuT!WtVy;ryhslLD9iyv9p9oc;DF7%f_!l zs{5yWnhD1d%EF&be29#`PbZ~yM;iQ(7fz#RaPzeM*gp3ROjRmhcZ4VFUv02bD_rv9 znCTfP3OlA}W7~9gu$u5B@^yBTu-;Fm;@_I42GZb7u1CJ6)i5>K?&)m1)l=}U=~+>) zbQoZicCWHPxEpcD^g*gqM=&=di)3gb*6ZJ7!jC} z6WIlrg&SwYs#*`>?$)%J+jk_#O`VSa36HR5qHDO(nvJbiR<-dCUTlr&-~ABy+&Y4E zJ~I`jC^Glew8j&M!L5K`fX|9z1CCtPAM48E*h!$6O)u6~%>ZiJb^P3{r*QpD13HM0 z&in=3|1mQa?g`~d=m5?uPwI6*@*cSFeXr1U`c@ZR+1Er}*0Lm3)B#*wHc0hj6W(2x zqB`G%zbxyk+TDbIEbIH^#wLE3(-AH$>?NRU-iU%Qbv&dLlku5tkN0#ARDQBYpC!m=}$hW8*A6nNAX?N^5yoO1H+vMCkIQDKXx4ovs_f)s=R-e2 zWR&wvJJ!!0g_Gx`XwF_y*xqqn3WBI)+o4ZNGH&fAIX5v~e1{Hrlo8-ON%d%H40H9- zIijBKRnGxYL)1Kl9dnb=KwLjJRWrU_wEBoU6H0@O1j6n4M&dSL>%6@9Pp(04rt@{< zvib6JhhcdkZV0D$`*zL?Ln`4a-t*!MsL9vs*C!D&;LG#5m?aQAkr>@60b97(1-WP~ z9=o7e)wa`{C>L z7@MvpZDHv7KbKL-{8*)Ira{JiZd@@t}+N;BQjxx4|Fs-7dRK+QRm?MVHMi z$hu>1hzbWc6UsLtMcqoGAej)2MFa^k)l3AAkn4H z?F3ZTI_!Maq-y^Zx4b$A?I#UbIFG+NHhCUoL)?D3?eI%NDG#NmRuIk9z$>_Lg#pdQvsPrGT)YwP8uFfcaU*cFj);eG4hv}L zRv!W`@f#SJ71OZ2E-3+6+#74cNX*bUgfGNwC(PBwj_3%^|1D=Qi}41_~1+{EBH zd=F=X=hFfYp#{rY$h1D?FfMYBOAg_ygI4HPEpQ0$c8^U7;pz=7#g6WkL%83XajEOO z8hsyHk1UcM$M}O%zJ9r~?~_?Temr6K4$x@Dgh|nUw(e&VwvI4Ht_sQQ!k=R_5=O{u zdY8 z8Li%rudN!JH6?`a*MzTgsCsB6A4v;`@hxs(N8`8FWc5!ZF0|Gd045g{Zl?%Y>d6Qv zIm!1VVC~x2lvYssC>e!JXqlKP>%i2WftQJO`EysvcMp<>S9>zkA_D`uDC}w)M8I}~ zoMmdiS0AJa)8kxo=0?DPy_2Zc~MeA2_gcHoZZ zTlA6dvvq}t>>%(qght}M8|vVzV#G#h#Nq3I$V9K;7%zw3#(7>R+KLZ*uc-pH_?=Cu zCezPdd?O95^nLKgrYN)*k9>b2;_>eH zt5oL}@ z-DiCRk#NEtB;KGB3!&AjUIuq^2}$4*ELEBY;BoaSgNI994tHVXf?zP<7k?E~V;-W# zLmTI#DZaNGGZD)4o!vPesV=>UIp5c+pXT{gyCx&_7M{BMjOyGRoVn*1ipF>MtU$~0 zZ}vW4FnSggQRo-A8rHVlW7};U@&mktXmCzVtgPaP+>Rs@7S!cwb7- zusLEix|)S4xN_f9QQuTRoBb%9yLn#t6@GtTV&uDEiVlRp0eo)XbkrLg_xC{`;&J=S z(W}_E{~&T>Thkm^3NJQIAN_K9FnDvTaAc-b*N>bCWB{p)Q)EC3@0G#t4&{FMDGL7i z;wRs2uo)S~yO(H$-oEMs$vx5YzHKdG5#%%Y%?+b z0I9B+e0?sb^+0;x$m>;VWX13wJn_hkv?r1AXYbez&(u z^fPuVOUK0+kVxJbYINhPlOFJ^bZEj&zYYsaa}M^GQ*E-{f3Mo)1`YL zc}_699+tT7ThgzQyz)mMh6zV}(GNcCInb043}(aclkJJY;AD7qz_Tq9o?I}<5WHV7 zSOIPAfM9UT-ar^Sqd|gqej+?O2ZhY5;UeFXbg|mx>ZHd z@vFnk(T3&W#nB!WWTi*6!5keAwBgYjGwggAvIMRKx%p29gQUZW+-eo@EGKd`AXln- zhf0}cDGRV21etg?7<@>6AQ~R+#afiC@`ZanPoUVnpJ>svoCx^@n!~%e2t7J-)}BGk zFpPZ2tkl~;$c9V`TcxLbmdr}Y^5HT0u$X)}%;QBPk^Tw!G?aHdWr1tqGE7N zJ}~7V9Ryc>4smR}VL5HKNl&Zvv`J5o^lX%#58!7}a#1PhY63_8uzc-mjdYyb&$-0K>^?OkX z(hq7}O`Gz0B>DW2(h2$ek;CmBRf783<^OEUXN%5gd@WtYhZSNtAH?|R7%`oQ0yh~y3_a);Cn^5K+hIV0Zc(MaDzK7Hb! z;e8Pjs*}%^)JtN1@7d942HLRKXhB(Fod-x{dva0ALq$16I*U{)Ryi|r(aL)Ko9LTd z^zzV>=~4z^mfZ*wM$%qXiq3?iKYPzkL|G9V9#FOo-iS$PXhgl#toN3XX6FfEuZuJ< RMv~=#VJ_}HISI{C{U1QXz?%R7 diff --git a/tools/bin2c/bin2c.cpp b/tools/bin2c/bin2c.cpp index 71914b2..dc7d6cb 100644 --- a/tools/bin2c/bin2c.cpp +++ b/tools/bin2c/bin2c.cpp @@ -171,7 +171,7 @@ public: bool m_outputAsCStr; }; -void error(const bx::StringView& _format, ...) +void error(const char* _format, ...) { bx::WriterI* stdOut = bx::getStdOut(); bx::Error err;