From 490e54040959811430b62ed0dde3208d0985c12a Mon Sep 17 00:00:00 2001 From: Michael McMaster Date: Tue, 31 May 2016 21:04:44 +1000 Subject: [PATCH] v6.0BETA1 release --- doc/SCSI2SD_QuickStartGuide.odt | Bin 17281 -> 17491 bytes src/scsi2sd-util6/Makefile | 9 +++------ src/scsi2sd-util6/scsi2sd-util.cc | 12 ++++++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/doc/SCSI2SD_QuickStartGuide.odt b/doc/SCSI2SD_QuickStartGuide.odt index 5c278a0f59de76e939567850b2a9117f456b887b..61b1bba2ebd5497379380f716828464d3b3010ee 100644 GIT binary patch delta 12308 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 delta 12111 zcmZ{~1yo$k(k_g<6D+v91a}ym!QF!dNN{)AxclJl8r&r~3GNag1b6oU0dDf%@7!~~ zv;M!=?5XPNr)u}^*=xG$Sv?m49T*OcuBreF_XY|I2@0yrq$3d>jPXav#bFGn%Me0A z$q*)5$O5FKr1bRk%*@Q(+}y&#!rtCcAP`7FK|w=9!@$7c!-o$xHa0FUF226LdU~JT z+&ZG8p^}rKGBcryi=iqjp&A;XIy#{G`=N%1p=M{HR#u=UCs}uPppK59Zf~JpU!gWO zSWiw^UtU;WUpZ%I4Q_7@USBm|U;li&yuSJbV+04s#Kb@#kgTk%fPkLFbv(1={E+dvkLKtE(s5+uIu(=f}s#J3E)h$G6YVJFl-t*VorKH;qEjzoCI}l`B{% zC_HF+DUhb;%Bc~$$99{Wl82^2>R`*rq%7x}(rS~EK@vkitLQ9ce1D5LCd|<=!w&w} z*H`*4@kt+T<3D~A%4pt2wu+{@98$o#-xLY({w3`nx5_RvPkn@a8{sV_Qb?v2UoQLa z?n^`YT<4l>(cCsr^!|;7E=zIVltrMCAk7Jym!5osU|2EOfU` zla`4i%G<8?D$!g52EuGdp9bYkldd(hb9OUgN^_N|Rf`Y+D?vVSzoa>KWp#{FL1slB zv7DVycxy4{Qd7aQ3bCxI{rH&2&%L(6|vbrt7FDl&7lujK{7^Ol=8kvU5J%Q2J6 z3@&amHc8{jo_7QhsT1 zl0|iglJETT=7qlZNRn;e7Jx#5hz-iZ&pDchQmtC+UtTme$T?*HwFz zNGXur#9TW}Q59!%1+r;EuNEh+{UkpB6S}e`g)v35Wf~08uE$4^)lUYr_pQ$=S!gLc zW|^qJ5=IJVK#68jSc3B7Xp%H)n2Va#VT|=OD%|iJM!{9q1+KK^37ph{@!$n2)GHdE zM4Yc+tALFHRvNk&RFLi&0j@^`^7;>U8Dk+5*)yT``<+i@7Yd%;$en}nUh6p+>xb@N zo6fDT-8`}iXC;y4U9JFEQrs{qr%4c?%{f?r(C_D`fadX?KVdXW9ABzQ--Yg&r9_DP zrj_WZCLUK7j+@h=Yqv#aub`aO^crkHoif#@Z`voA5(ItP%f5tIN#JPiu$aB5frr$h-raz<`UR~oRRnRQJEf? z7SxOuCDkCj1crSSS(HL5-P#zoH~bPZ=B%V}Ao%y7^kh^6NpoEzByP0^^+XjStPpXI zLHMi1{3n@IOImNvZ?}8~D6A(W_mw^Of?^TfgS25m zzam=4x#baGb^-yjaGDJHw7UoX&A^N&&bx8tCq+h5aCEryJyE#1D~XP>QTl<%s8y~tv;rJuaEyJ^hR90b70>J| z?}LH6o$nepKsw^vk{d zM1qPGM<>q5G?ZbhMi0?WjyBoEE~t&023b#zXw!t^leS`AecYLDMpz;2m)=k5_-!#L zC@TcX9#@#Mq^_~3X_H8_l=Y@=;#T4Qn0RYUYLcPhQfbr0pJRgD5EmuPXpg}J@1nrV z9bt+2l@S0A95G$g0%k#hZE{KQZ_N=c&BAgRj{!B+Nk@2P?X+2mjG*d*5~ekkB;VkK zF~sGx24%iU%$d&$BwP3O50A%>=Ly@6Nf*hpojCU+>t%}Pld~o~WNi1hjqga9et%t7 zG7xJ2G$7)nB3!EP^KCF#37yO<0|eg3SzSfhQG^3Jvl?7DbO*6xm4im3Ojff#X594v=dM>*G3)@|z7DDRn}$&TWv$T`cvH z%FV&u+J>w!n)#s5;ExyXj^hC+jZ?vivxL1P?YOn-#;UQgwNCENXvyD03ui~ys>Bw( z5-`A1KCw8zDzJU~>r7*q(4I~@|H$T)htL3mIZPgBFUq0)I zM)l=gb?-dnTjO=$&FWsY)v;?`u4Zo`@LPB2T(fMP^jkW4R9dInJ}N83F9?&NC`O(p zkwCtcVW^}$O>V*RUYSpXFC-No7^FFn%>=?JjJSp2%*%;em<@l2E4g$Fi6NfU81NmJ z9$#yT4cd2h8`z~9{D6XKAvm`GV%OpR#b&Cr)L|trYDHF#|C}nuRj!9H43~KNFl0x9 zp-3hZOHwMNWarBi87VG~RK!@w^sRIAV^xb$?P|;RYpIZf&P0PAYnsv=#`@Up)o;Le zA-mS8+c4*Kx<Tmb{HDjs35KrXiCU=T_UEu~fLPelDZd8Q(S;7vwOLX;I8CPcGYajuX{l-pG=8c9Ij6D_h? z7Pm1}v3YTTurW0cLw$=f6AFa6im#u$Tx@A14(SXd#*wNJ{f8rQCsfSr)X$L|q-wmTW!Jz>_QNx#4)1UEHfe z(gd&4ClddaASssDAhsm{)f*6cLo^+bpID$5p6+OxygxW_lqs+W8^7$y#G{fKLRog1 zsmF;$Kd2w1`0Ig5#IJVS5H$(?Fk3G&TqOchl2&NM&67)(IS%Zj3vmngc0${G z!sN94^aX6CP;)7K&VE2bT2|8eJ-Pt!e!khvpJuZtj1E1hz$4}B#RXMkDa=ecjDZQ= z#rKZ_97!LAKFoqpYE6zmoykq}!uHHSK_rq&^K{-95y1NO!edHE+-;I4L5&msN=r5+ z3kAv13}{%I&@>Ly6<;32Q@+LiFq0vOH9nUcZQRg6KKga4$J`T0b{9EXiVxQZ1^%89 zyR3i{mcRU7eyCxV`V)N{;5NO8k9!-0zE<8$?o|YrRJ1sQI*e*nzz5xgttko=j!c%{2V!MZ94KZft$){F9S^v0l-SvH@ zfHx4RM&AwpIC5??U@j(b|Ht9fmWE+Yn8xhPhN|u+t}fJw9DK>Kdy{-6CqcYPY5K)ncyfe9CoGM!phAn}v25CH+ zT60S#AE1XK{U})_F2IVP>1s6g=YM`UdQbw!IV4_GapPW%k}fX}uDL6fWa(I z+oRfqre-L8XixA()Tm>B(h z&+E5=JBK1PqW>ym^wnes#K6Bzw&kxkv*K`?Ga;!GD3s`j`Nihs!MsbO6VjyRx(6#g zjwy{={B-kW(ni_8<|>4yWbSCc1`!bK+m8Q%y@+MfscQxF`g`RWr5JZ{|Bo zetxbUQDe;Rtnk@`=x2#%GLgYVs){|3jn))=r?ulw@v2WznwHsp0uynOb$KJ4g#ui8 zbMWeLXp%HvUKBR$_S`?Ch9sZx>Nq-9Hgd|7j_aY{M)N$PjIC zlJYZ5ivOb7wT__2(=}`FauxiX^gVRFPb|-G|J$29tXwoVk{>6PQYZaX;KL?v9=IUQ zj4v9hg(%qi2z~7P<;6CMv>-aFlX{ZG_3IY=8smhW1*A76;4v@|sgEC!;}waOqNSzq zBLd_aCun2zF{vXYhJa4gs?*)nd^_T?O4@FYL;0|1s-WkGEnDr??p~oWrl>UEYvag6 zl2P<~)3IZPlQ4}F-n7@8T&UaZlE7L!=@IyemyD%TuTI-7Nle?zFyGhk^d%xCr-Mre`;Fok6-nc)7wlUmoFKt-? zO=P|=2|jnwCEjygY2v<%^n04J4NMxqL~$Xv@Z9fcB}G?{w{{v1-i+^GrwQe2b0k9@#x>)77Ohrpj*^kN)td z&_Q?B)sYLJx+>N*QF-XTI??fAYSYi7-ukM;sCD9Pl-%5A)+^usgw|Qhgk`ftWvOv3 zuaZl>zT0$V>MG^4SMYoP5#-6G`dDeQ2F`nF=rTV_hR^+UpO~+c?cgR^9swmsQT8! z%UuB2XGXZbb?m&YS+(zs_HSKvawLDDnP;^bdv->}wP;`YTx$Z) zJ>iagXA6AFvTOwr+hw{m&Fmr+C^U^J2(P-Y)=UQp?N~X*kAHO!mib9#(yq_*sb-a2 zn}cGJAb$u2JHySx*FD0hIR_I!u}(lLseS}l=W0Wd+Pgw*KP`QK4v0Q^)ar!K!VnHd zZ;`2n9xm1EZ-Xo7tw*Pk>;$1;IWg?6JLzn&pZPAlw@+UlyDMC~k!xC(u%#HG53loo zb9?tCXLg-R1qfF@J%Vkti9aync+_S3e55`Y^zqFX4b%)G&Kgy<<_PHk zbPeM7Q&9QbK8i~iyb?w_U4mq@nG`9*`n@fi$U?O8yOfw{;ijx_m9!YcW*nu!rU4TM zw9yCFKibvnsSXnquT}~%K_YG0F`Ouk#=qQqYS`F&gg%D}eXbYEzI^*VxPBOTN~ld6 zS*tbo_=0oZm${Q)XAF3dJL{SYoqPOGpWD@dp_)_KCZ(Hcw0!nEiaUOy$e2+TXH zxo5@Lxj*>sVIe2UeJ(~)ipKYl5i5I4b!=y{w9zVy@>^2vdS$+uqf1*jGZ|XiTv;FG zJ-Pvf@>@hng5QvV@)FKEPp=d}wlYE*8R?)=4aCgZb=6`y$Nyxyd_t3=Gj2OkrC_bR z-8;*{-!abZ8FQ~sJ7pt#iFQwcNEX(Snwu6?22Yq_VPT$P+jl(5%(FCD%W=_!1J*QY z%fg*XyY5&hDWm{f96?3V{wSJFAc~IC86Lx{{S@z5zoDh}hG~!>FnSs|^hS7ZU`Uvq z+IJDPTH@Sy6zXY$+Wy`uE&OBHoTu)HAT1Fls?=FpM_jmH#~%85JIF|OM?}Zy%DzXP zR$1-ZM;&8mZ(uX<+ogB==&^s@X%V!hraTWGJ$Ty|!8(%jIqI{?lH+C5r8#i#5YucOe zgFIhb8|tT!*Do2ij^)qZq14F zdxD%{iWt0sIU~5AaWh3LnAYD!t3F-pE@H?w+WLpUUW%V2Y;9KSz80Uu6!TV??qutC z^PR3B`RDD0+ff2fT{l+v&QhkdxweLMgpP=xw(_=Xs3d*#b z@QxnzZPBoNOZ=!~$q0@BDIx_+gQ|U|P`7%>_n>LFaaRnMuIl2~tE0!SIS{PcfJ1+i zXc>vEPbEY(F?CwAfdlg6ZR2>`I+*Du)%KIChGBhor!|&b(?s`O>Z&GX`@M_du^(9( z^!#V^qjx$<&AK+R1X<1`XT*ov+Hni!+}|j6$M#8UgL0>?T!uda@^BKp%PC9=KZZgy zctT-gdG(4^Zyp0gg3P_$@fbeCyMlvQ%yy_!l1#@@;Q6s^-{7mDd_UfY#XPS})W{0< zdZ8PN72iaefmpmaJ{1-1vA7BMLnqW|%As~tN3$SuTuSmk1YouY?0!hoC3Avxx@?Zz zec<5C!&~34UZNNVCj9s$A-6*xC?nU~+Q({fSxv~n?NFXY(&Cw|GcCQrP&joyka4+ntY6zJqxAT z)bM2T9NH!+#X+2GsZNXAmI_*-{Iqw++$z`gCnr9jICu*kIz2z`@bJWD0TKX_9Wf=nRTgiH;ajq))f8Y9i8cfS<%kP*sad_oLHrM%6s z6liqCMQ)@GUKu5v1hZgu2dUIaQdxe+3t6aFhSa<{GlBTBNc&Q}U|29#@-q^Rqr&h@;$PNNhRvEO(s;he!g)q6uJ0R zu>S2y{Dos)(Wmqy7&NiOTuk%plM&le6KK3+@ue?XWCjfv2ivSa*4r=Il&2mE-!;wI z>!X29f%%N^wN|d06=J53774$6HwW?tlsjZe-2fV0(kt-bWSJ<9V7%ZS3eJtF+s%>i zQ8u&O^z#m{=RD~C6S8O+I++^+8AIP3kKa?>r=SH4KHwIf93Qq5Kcu|afUu(#`|v6> zywVL3_pP=w3G%fq&D2`s2G2oNk4<$_^PRB_U^v~=XHrJ2AcBv@NO?=}&fRTOO?Nhc z*%>oDjfS~y{Fk<@Pd@YWxRV=BjmMIvupu;@IVfn}qEsI0GZk0GS5R2$gYHd*0(z<8 zsH?Ix%7nd_zgajt{Ege9l0{o3qNdI;xI~=^4jDJl!~c-tC!||d&~&} zAO|+Ud}KlTp5(ds#!#|A-1IvW3kEsJ7k~fwc+W+fz&b5IQ8u|s*UslVaWNO=9@pCv zybn?JoKh9T9Gwc6i0LIypBjH}_sH6&I{7%38=-;i!VX1NIDpsnnYX1jn2+Jhv_s_+ zEYDN#Vs1|+mjj<@B`YR4f~Vdk+@7fI1FD@df^L}>zXZbSyVuUi+l)DrSI}JU1P~em z*T_gM)7}*EHpYm4FiKNF4?~aC;)FUqph)xph~(Mkg|A5<^nueDi+hw4Q9`A9a{$HEY$^)$ahwP&hMh zPs-Rs%STihRkIlVh^VsMTdYTs+ylN_@OZA7N%{$q%`>^_1sb%@i*&A@FaFV=bzA2X zY~qe?FB-N!+gDJ2I6${a>G*tCVPK7S=hF-}($<}4y&XPVWOmhCdEYwyp%dV()H-U& zZo3PvvdeQj7HJ2&Os?#P;Q~)5!P!QLmabpsH1hs@wz-d~r*oZvq$N~hSifNcNrW6IuP$m8tb?_deOe%c`2AmCv( z>Jsh1C1^eBI&}wmGu$yot^J{g1AbpN0iuwDW$^ z_B4AqetD|##Wv#_4Nl0*{%q=pg+TC?^tEw8SS+5%U?+U(`?}$>#=&$BT>N}?CJvsT z;<7<<$kw<>E(?oh*`7#YyV(>8t3y8;XIOoQHw{f}z^W0{jyjl1=RBVs;ZISfz%=M# zNOvU;;k~uqgq0cF(JTcj zNOJNC^-u2PC<-6fRcEe;v=*v)9`%FYG43n!d_vkw)l>6zE>Gq4ShjQ#m;dO2=>D;n1-4Hh?xT)1Aq2B5!mWjplpBjIA4EWl>q@Uyv_|5-qK5pB9^AW?y8V<@jLJH#GjaptM!SHnb)0n8O3Af0qvC;}|*$4U#*{ zcfGZz;NTG5iY0~H7@)X$03_b9CXF^F{NdGc?E{#yVkk~ z2Q_bT%%rTMMAe}wc`z+XFP{9l#-)xyiUAVHqNVl#m9Mq7e2fU0!ru{JO(&mOtX)mM ziv8C9*A;e3Xo6sxO0A)L$Zu&snnc*!{4{as15fL+MnHFcoP`LLVpoNr30!La{aD`z zde)39Bne$+aCUa!RBe@)FJ@6~lw0lU2W`*FCU;ffDMrx>SCxX8JrQ_TuA;C!FLcT* zk_>z6aFhhaOBpV)iphU8UDJX!c3Q#R z$)Fk;^5PRPIg};7wiJ<=PM^qKmS*<2L=&Qpa~Q@*LsLod+ z1&G1T>8_({J5NN9T(QC}Zw_J1CX;%{GJX)>=20g$=^3OpfC_4*RQ#MaK+t}oZxGau0q4$0$QXf%Ukg?3L zWsVA~BK0e{)IAbE_(T}gCEA7EoZ9$@E2>wZ;)~vQihf%XfAOqfK99AbPX6)45YqjP zR!ec%`MgIMK<9j||CL;|qyrMLjB4RY<1KHe1#)dt5aLU|tXoIoz3VrTx3;e<(d99m zWc5_q?)#+4mXgqO|FXP-06Xnw^xaOPL?OVvla#QMYxJO>r@96qO0Adqrx0O)1e|4y z%CDXRZ+B98#%99XUxeOu(G)R#ZMlc)T-s|w0U!8!X=zg79D+RZ{2T;dtTz&k$LCHz zya67tWaLcYD_|-G>cIqvps5g@pMhi%^@jT!Y`naf%&mSK*J6S^q@%a9ljf#T5j`?{{B9iLRr%N!W3;F_T-O;=ZsMOZ?=y_p?%1n+%qF2lD zu8p^Dq$-l0E1oYFU=KajJWRGcH{-21!{9Ek|E&;53NFobUHXv|x?4&)FR+$xmC5*! zKis!qfPD509o6&q#fg_G;XHwcf)a!KuNMar!A%Yrc&zYa`L7!%4)}~(K)5$)ZV1)& zTWA~uct1YToj}_p@`xspY^lo?m3&>H$1%uF{J8hDN44&+OS^SKl)T4q&UEY1 zJW4c-Ma{PFkx~medvM#8JdQWWp72DPKpJ3ywwmN2lvKDO5@B=W>haSVNw%e$GvuRH z5a$Dwz7M|HxvSqhUQjAy>1n_*WIJQ3e`nRGZ^V{%o(gnJ^3*Om*xOg0ow-{@IDg&$ zRynHEqa7N-9(4lyV42+@Q|+!c@mia0$NMnK9SgRx2|qnuK+1r1K-$c80?qB6KyQ+t2slR>X$q(6b^+0lgy?S=Mfw zzX-r4NfP}aLC*RjYkOeH##SvwM-Md}E>1JC z?K>tH9P-=cw_J0eL|SKpISY9QYBn(JtwE=&-Y3=5b)PTVj`t!W2+#$AH$tdzTHV<@kam_GB)<^?Swlma?Aje0W9p}oZ_Ohwj?avV##U+J`fh9mFg zjWcx}DHMs+GV&F@tsuqbji3vg$ndLNX=Df7cJMpzpbMu`k|*7Lu|%D($hiH%x#Yqh zpB+x!YQN9c`#p>b29+^NNs?tMl7`(OzwLm@co!2@A*-0Z?f2<{scfE&H9M14-1oo< zoA zJ(OcOrr9+QC;L}ca75FT`AU|8=JYN&OVsLAjhRA8k~kUr|9^YoPy*_AF6p~zEY22E~TA_suY@e>k%Hwfm`$Qe$xsa z7TZqz5~^u^AoP{-9Sb9_+E{J*C}|nX4Q|VaJG4AF{s1ZaX>35EDx?_DCgbjb$a zh#2nm>f8~Pl*I+NA}1|Jfb(91SS<6#Pwn%V=j-xb&dP%70aLVy%KS|RZd(cKtY4S- zPL%UERbpW{OWX7-ENP>xf}nAe$)jE7VS&MqqAMS2u8fOtAyEmR>VoCLA~7OeOnx2K zj7J9k9J~pnfh*sB&vi#$9$qSS*L8iw#9*E2$T$nsh)(@03rjW$R5_=! zM@;D|CT`MkPGjKaO&&3wcCdI_Glfe&+gjVsyA5S>0&?~6Y8x-th(+i@bO#saoj8~x zB!`b}g@lQUH-XarSXqqH^{uSEC+CD*c=+rCFrc-DXnSj6A;mC9M@|fylV) zUuziY>MBY>hKadYKzFc&^DTRquYNsV8ziu6lB$FqR%s35SL0`XFwxGd1rC!7xOjzM z?6hXst6^I)W)@T%R_KL$<~EDgGuq|H+A?{b%L_H9`mx z5`QcF7xbU$6YBp0;SoVWeQ>aMwXk>nni_Zi*FfN(fmcBYr4SjU3-s^! zd_oX|{}=yX*uOWn6M{@j(ET%yzph0>kV8ST|BslfLXcFUe+~R=)utqgp>ZL{lEnY` ZBTEs(sEa_vMF}7xQdkImqJNj|{{T8F3x)sy diff --git a/src/scsi2sd-util6/Makefile b/src/scsi2sd-util6/Makefile index dabd5500..3cd88aa0 100755 --- a/src/scsi2sd-util6/Makefile +++ b/src/scsi2sd-util6/Makefile @@ -69,6 +69,7 @@ ifeq ($(TARGET),Win64) endif ifeq ($(TARGET),Linux) VPATH += hidapi/linux + CPPFLAGS += -DHAS_LIBUSB LDFLAGS += -ludev -lexpat -lusb-1.0 BUILD := $(PWD)/build/linux endif @@ -82,7 +83,7 @@ ifeq ($(TARGET),Darwin) BUILD := $(PWD)/build/mac all: $(BUILD)/scsi2sd-util6.dmg -$(BUILD)/scsi2sd-util6.dmg: $(BUILD)/scsi2sd-util6 $(BUILD)/scsi2sd-monitor +$(BUILD)/scsi2sd-util6.dmg: $(BUILD)/scsi2sd-util6 mkdir -p $(dir $@)/dmg cp $(BUILD)/scsi2sd-util6 $(dir $@)/dmg chmod a+rx $(dir $@)/dmg/* @@ -179,10 +180,6 @@ $(BUILD)/scsi2sd-util6$(EXE): $(OBJ) $(BUILD)/scsi2sd-util.o mkdir -p $(dir $@) $(CXX) $(CXXFLAGS) $^ $(LDFLAGS_WX) $(LDFLAGS) -o $@ -$(BUILD)/scsi2sd-monitor$(EXE): $(OBJ) $(BUILD)/scsi2sd-monitor.o - mkdir -p $(dir $@) - $(CXX) $(CXXFLAGS) $^ $(LDFLAGS_WX) $(LDFLAGS) -o $@ - clean: rm $(BUILD)/scsi2sd-util6$(EXE) $(OBJ) $(BUILD)/libzipper/buildstamp @@ -198,7 +195,7 @@ dist: ../SCSI2SD/src/hidpacket.c ../../include/hidpacket.h ../../include/scsi2sd.h \ libzipper-1.0.4 Makefile \ SCSI2SD_Bootloader.cc SCSI2SD_Bootloader.hh SCSI2SD_HID.cc SCSI2SD_HID.hh \ - scsi2sd-monitor.cc scsi2sd-util.cc TargetPanel.cc TargetPanel.hh \ + scsi2sd-util.cc TargetPanel.cc TargetPanel.hh \ BoardPanel.cc BoardPanel.hh \ $(NAME)-$(VERSION) tar jcvf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) diff --git a/src/scsi2sd-util6/scsi2sd-util.cc b/src/scsi2sd-util6/scsi2sd-util.cc index 2fbbfdb8..8f1d23f4 100644 --- a/src/scsi2sd-util6/scsi2sd-util.cc +++ b/src/scsi2sd-util6/scsi2sd-util.cc @@ -58,7 +58,9 @@ using std::shared_ptr; using std::tr1::shared_ptr; #endif +#ifdef HAS_LIBUSB #include +#endif using namespace SCSI2SD; @@ -110,6 +112,7 @@ void ProgressUpdate(unsigned char arrayId, unsigned short rowNum) namespace { bool hasDFUdevice() { +#ifdef HAS_LIBUSB bool found = false; libusb_device **list; @@ -130,6 +133,9 @@ bool hasDFUdevice() { libusb_free_device_list(list, 1); return found; +#else + return false; +#endif } @@ -565,7 +571,11 @@ private: std::string cmd = ss.str(); int result = system(cmd.c_str()); +#ifdef WIN32 + if (result != 0) +#else if (WEXITSTATUS(result) != 0) +#endif { wxMessageBox( "Update failed", @@ -930,7 +940,9 @@ class App : public wxApp public: virtual bool OnInit() { +#ifdef HAS_LIBUSB libusb_init(NULL); +#endif AppFrame* frame = new AppFrame(); frame->Show(true); SetTopWindow(frame); -- 2.38.5