diff --git a/3rdparty/libbacktrace/wscript b/3rdparty/libbacktrace/wscript index 8cfc1d0f..ec707e92 100644 --- a/3rdparty/libbacktrace/wscript +++ b/3rdparty/libbacktrace/wscript @@ -75,13 +75,8 @@ def configure(conf): conf.fatal('Can\'t find libbacktrace submodule. Run `git submodule update --init --recursive`.') return - if conf.env.DEST_SIZEOF_VOID_P == 8: - conf.define('BACKTRACE_ELF_SIZE', 64) - conf.define('BACKTRACE_XCOFF_SIZE', 64) - else: - conf.define('BACKTRACE_ELF_SIZE', 32) - conf.define('BACKTRACE_XCOFF_SIZE', 32) - + conf.define('BACKTRACE_ELF_SIZE', 64 if conf.env.DEST_SIZEOF_VOID_P == 8 else 32) + conf.define('BACKTRACE_XCOFF_SIZE', 64 if conf.env.DEST_SIZEOF_VOID_P == 8 else 32) conf.define('_ALL_SOURCE', 1) conf.define('_GNU_SOURCE', 1) conf.define('_POSIX_PTHREAD_SEMANTICS', 1) diff --git a/3rdparty/maintui b/3rdparty/maintui index 0b6ee5b2..a136560e 160000 --- a/3rdparty/maintui +++ b/3rdparty/maintui @@ -1 +1 @@ -Subproject commit 0b6ee5b2d8d65117f54b071f0fb3a68d63d4e725 +Subproject commit a136560e3fecb2d4d965d798b0fad59c32ac0a9e diff --git a/scripts/waifulib/compiler_optimizations.py b/scripts/waifulib/compiler_optimizations.py index 308c41fe..d12577fa 100644 --- a/scripts/waifulib/compiler_optimizations.py +++ b/scripts/waifulib/compiler_optimizations.py @@ -267,9 +267,7 @@ def get_optimization_flags(conf): if conf.env.COMPILER_CC in ['gcc', 'clang'] and conf.env.DEST_OS not in ['android']: # HLSDK by default compiles with these options under Linux # no reason for us to not do the same - - # TODO: fix DEST_CPU in force 32 bit mode - if conf.env.DEST_CPU == 'x86' or (conf.env.DEST_CPU == 'x86_64' and conf.env.DEST_SIZEOF_VOID_P == 4): + if conf.env.DEST_CPU == 'x86': cflags.append('-march=pentium-m') cflags.append('-mtune=core2') diff --git a/scripts/waifulib/vgui.py b/scripts/waifulib/vgui.py index c0c204cb..00dc0358 100644 --- a/scripts/waifulib/vgui.py +++ b/scripts/waifulib/vgui.py @@ -28,16 +28,12 @@ def options(opt): @conf def check_vgui(conf): - if conf.env.DEST_CPU == 'x86' or (conf.env.DEST_CPU == 'x86_64' and conf.env.DEST_SIZEOF_VOID_P == 4): - vgui_dest_cpu = 'x86' # link with 32-bit binary when crosscompiling to 32-bit - else: vgui_dest_cpu = conf.env.DEST_CPU - if not conf.options.ENABLE_UNSUPPORTED_VGUI: conf.start_msg('Does this architecture support VGUI?') - if vgui_dest_cpu != 'x86': + if conf.env.DEST_CPU != 'x86': conf.end_msg('no') - Logs.warn('vgui is not supported on this CPU: ' + str(vgui_dest_cpu)) + Logs.warn('vgui is not supported on this CPU: ' + str(conf.env.DEST_CPU)) return False else: conf.end_msg('yes') @@ -64,25 +60,25 @@ def check_vgui(conf): if conf.env.DEST_OS == 'win32': conf.env.LIB_VGUI = ['vgui'] libpath = os.path.join(libpath, 'win32_vc6') - if vgui_dest_cpu != 'x86': + if conf.env.DEST_CPU != 'x86': # for 32-bit x86 it's expected to be under win32_vc6 # for others, it's expected to be under win32_vc6 subdirectory matching CPU arch (x86_64 for 64-bit CPUs) - libpath = os.path.join(libpath, vgui_dest_cpu) + libpath = os.path.join(libpath, conf.env.DEST_CPU) conf.env.LIBPATH_VGUI = [libpath] elif conf.env.DEST_OS == 'linux': conf.env.LIB_VGUI = [':vgui.so'] - if vgui_dest_cpu != 'x86': - libpath = os.path.join(libpath, vgui_dest_cpu) + if conf.env.DEST_CPU != 'x86': + libpath = os.path.join(libpath, conf.env.DEST_CPU) conf.env.LIBPATH_VGUI = [libpath] elif conf.env.DEST_OS == 'darwin': - if vgui_dest_cpu != 'x86': - conf.env.LDFLAGS_VGUI = [os.path.join(libpath, vgui_dest_cpu, 'vgui.dylib')] + if conf.env.DEST_CPU != 'x86': + conf.env.LDFLAGS_VGUI = [os.path.join(libpath, conf.env.DEST_CPU, 'vgui.dylib')] else: conf.env.LDFLAGS_VGUI = [os.path.join(libpath, 'vgui.dylib')] else: # TODO: figure out what to do here conf.env.LIB_VGUI = ['vgui'] - conf.env.LIBPATH_VGUI = [os.path.join(libpath, conf.env.DEST_OS, vgui_dest_cpu)] + conf.env.LIBPATH_VGUI = [os.path.join(libpath, conf.env.DEST_OS, conf.env.DEST_CPU)] conf.env.INCLUDES_VGUI = [os.path.abspath(os.path.join(vgui_dev, 'include'))] diff --git a/waf b/waf index 1061d1b8..af379e16 100755 --- a/waf +++ b/waf @@ -33,12 +33,12 @@ POSSIBILITY OF SUCH DAMAGE. import os, sys, inspect VERSION="2.1.2" -REVISION="85109324d96842c0f85b4b7c26c6e629" +REVISION="af257ce3cbf137d78b2cbf93866d5f35" GIT="788d39722439c6b2b6a4f2e89bb8384553df1552" INSTALL='' -C1='#N' -C2='#H' -C3='#<' +C1='#F' +C2='#,' +C3='#(' cwd = os.getcwd() join = os.path.join @@ -174,5 +174,5 @@ if __name__ == '__main__': Scripting.waf_entry_point(cwd, VERSION, wafdir) #==> -#BZh91AY&SYUhfWC>A@x4czc.#N(#<#<#<#<#<#<#<#<#<#<#<#<#<#
rxkᄏloOl5r⎺RƨA++fnxv:;>ݾﻴ{v};yoyyۯ{g}kMׯqۜmݒ_{u]SNv^ۭ fFϻ#<ˣ-o8p;TIi۶mݚ65ֺ;v6H:jkïp#<`;ä>ʹnΗKϽK]r92w=7{7v{=1mݏc{nە{4wi-u]MNnw_2bwޫU6W]uMyzɮƾOM=*\LJY6Usk̨ۏ֛|Mִw6ۓvOwt[fn+`P==n_}\^5YK^6([u .{ٹ=wozθUnQuN}{p;W@ȷvmw]1kEe4{հt[g2zٕf;nfav@ip[9auɕ=jE#sP8#N,#H.#<7uQ=67n㵻m55Ld{̕+# zO鏭}aĭ ]6%(?CZ&,[?ɗ>jg|̪=ͮH-,F&FoCَ-\(OFKk}1aúFFƬ ψU#Nh#Nh,$l~?t¿[e~!؟G4GAF6tcϧ8|PMyy3.l^;JjAi:|V;Rh%Ӡumo1]H"^.߃of-F8+bHif-m#Nccބ/B9d%6~`'KГ#Nr0NnY%_Ɍ#N.050Aj$}B9XZf~cl~ۻr|!+˯H?2-Rl1^!ٙ%>۳߃CTԭaM4s#H jߐ8#c˵)ϝʺ{# @iCO'$ODryR݅ii"Jj |ބx&(B p%?]|#<7f)rSi@RPD6zebfb8 Wt#N4cO@#H|ǽ^.V hCCG/|f = ߈O(l/'y$R (#<aRWV!|ݷX*r銤#<nHHd(C݀sbHa|ߟn?K` !#N(Q{M%P0@Qt$$A#KLEԐ3B,ȨCbeV}3' +0ayn<# ZT'fL#-#H&JhvAȁ >b}hBImH?2@g'Iz+~˪he}h3LliTcXwۡ6Dtީg"6yӎN1TZ$1i踩ó#N3)Oub#P{έ Àq8Q%aQ\%lB#Hs(2[G"x֍H<4}M' 9֓m=Vb5 rѱp{ QA?O!ԾDe#Ӷ0n bti.H_0APٹ?R?ALdO#Gh%A)@X#<1s@$.6C4ȃdu')"M#|dF4=)xh@Ƙ؟@d]J75-U t@}Pq_>X[:#<(Q)8?'A;"`(CwNU%%r#!]!2ɲ~eQR/#HY<`ŵG8;aݒB;fy)AFA@dY}mo{*MoZzhkRs:_d+ahڇ@Ĕu:#Ҽ83&42=«XT{N_d,}GfY:XGGɇ=}X!i=0!@}p!AޙheNtZ>.w+( ̋Fnv<Fk6HMqczrI^q/A߉%c80!%< "SD#1)Z]mODSXF,q*߰Wq}pۧh9y%C3eg*,&m|렇 :7CStfh3\J#jY8_Cn`Z!3cm~L_(
JR0X5IrJz+HfD@?eƟYStd#
M3th/r"t]?-D7nJB1Dޘu}B ֟"A (I[2u@72lőb-dZPT۸j^Ez=ɏF7i-kֈ (H 6#Hg#<|i8~yVrp$ů;u/$mūk+@%gt ay.%mƒGFoFd#<$^-k(,,jD-#N5I4Л5Q(lItQmImf]Y +#H/VXj*VI~d%1,n#N,_ު,$ڒ!"5Gkö$Ǎp(3~Zh>*3#H,ˀ2m87+'jZV.rSѾ6V"͖+<?"pdhJ9@h̃aR:7^B^0ByJ~.sjŝЋnZM%#<'eov#
rȭ;`%&A8녺Z!h0j瘝o,oF#؟9{W=qp2^{/}=CcaM3#H\\-D#2fkbs۶M,Єlđg1"#H<8~Qvj{j7]<9gn>l.|C#<YFW3L155$]k8\O#N ;3/5kG0\65Xjd@HFz+RW?o|"=ٝbmD__F:7j)5Zȑ'U9)7N/dg8?
cQ2>Yug$MD@ /V1G$;GNnNsaN~NݣlM,2tK<k#HRJdyg,ƟC|fl=)SΖ^Lk6qT䇑̨ɹX}b(Pfʻ,kLCMKĘu5HC:rJ\BDLyԟ$%790^*3KfJ1oʏ`-e|蓑6Pf~../#H`Kn3&a3h}Ouge;pͥ#&οFmR^ёluN^s\D6S@b?ГlS%p˴Փ:tGlRᴨ7&Ƈ;{ρE]=0I`pEx^/|Id8](FK8*W1Rc14WAF[-Bbqr_f4TPcmC&vR}=j^҇jBBg%&pdG9hSG+LP?U-zlJ%dFVk@wr >iTᓏפ|;;вiW冰/G%Þhin[ȍha!x`78<OypچhS7He9ofNctffQ-#NРm >NrѹtyX;P$Udgw{33.7RЉcD+m^jh]]k)HôWgQweЮe#9HFV_+p"}iLu3B]HN aNe1-0O!Hq__$'#HPҡǎ)HГ(IprY@Ԫգϥ#>!#zgיtRCö2q͏IGBAqf+xF*;V_kÕFlpN#dy&.zjg'a.I&ka0d8梶nilnQVaw#kO#Hm&[l;Z7QY{-V"llOjnVfx2(7l6H-Q/t=< [hD/eͅܧJ_?#HEZ/4X/*^+MIGM^CjZȩ-?{8)ؖb&n[!H#pa[K`gq"y}<{p\huu#lĘovl鳂)֪$C/9$*m&^c_h]M>foB#NijVd;@JNq(1jN-1%RY stӦlGu\]ґ#oe:IPQz2
dR3O:25/'PqD{9b*|W>n>Q߸K-G,@phՃXZ#<3U+߱Fa,q_ȎL*2.-.B9v#'|r4ml:J#SPli#Nb#T6~bThtϮ k)=8۶kH"aG¸XLAaxUvs}Eܨ۴EG8rR%n$ħ{mOݶޚh83C$#H0;8XIP= \1@;[*xŸh@$'Cq#N?#(id"`Kwvb{hNFŽ13˲hpw
}v_ǏoT-%>i]@`-j/)&k n|ڂ8Nob@c5|3wOcWa`>Rvd{7L D#N%Z,8}GpaR>4;>2^>zZc*3H=>&EWړC0{QNϞ#NģEJYW?ι"k27[nxz|+\#_eōa5c}چNvS~HuxO}hlT'v:NUv$I!<3&-R#Nu|uDCGRCQ`TA"O{$vp`P>`x.4D@?iA#Nwh?>VFiD`8PK߲^m" }#<2κfϲx:*+SlA+. 5#NǛaK< j)N_3]E®kD]} [A;Zx#;q;1W"M|%7>MT#NEOHa̞ 2G#
wpA#k!蚠'TD +*er`PĦeD x ͉ݲ4kSs'멈'h)~2fsiRfQ LWvwtk2ۃDY!} [ ܩ5ƺbC>@O5h۪{:Yʅ/),k,Xp55#fLmRRMoG_}(:]h+Ibz@'p0+zk7PFb%`(<'я\!'ҮÄ|:(ifP3yNnlhˮdNTP4!ƴTsMe-=syN\`("xA\2"1>sQC+Ǥx=y+ꞈqdg kz+uPp`b(=e k<I߫2{p͒BNZ4 CKh <^p/pxã(1aٝpHѱuMX,66{}\,F"fCP$l`Q~Y~V$'!!'mLS9v*/ 8F6=UR:ߠ|`2/yf6l#_F&UV&[vIq^O/}@;@H#N '|.zLJPBA%Rߞ3hB@I>% 0ī{>7>n(fB?AGLj(E*ADDK*#DB 4(`(D!xBJA?`#<!q+Z}X#H%] BAӺF+b(aTeC< (3HOIl^7Fdp "QKpsВn>@@Bd#I1 RBDЈ(5QCTCzHK[)/ i1IJR4d4id(Bf44j$w1r|4_ho:8H:8~Ce@)"['f &j߶ 8DQ$yGaO#H"yp{q^rEUC;'PKǵjOc%3 1[p#Hw4a#dؑPHσl$#N@tE껶)#H $6b~
doƷ̘a{TLY7^9pu+:[F.&٧#N$A$9]kfa:]ۇ(ЊWE1yGƚ_'/>!HgK,Z(ީ#
ۮE_GxrrȤE1;tb8j^n?&GZi5"#dtUh8,|EP3Vj ܋J:_F|S܌g\̽C,\{An[k[cm}{7O7,x7kp7m,É[tKDM'M5xa;;aijzėFz].ss-a:Vs<\ޥyl#H^Z!0x'ݝ6bzےa9;qQSJQC6ϡs/8.wg^C7lbx"#N:o`V*chNk>#H?#NVrnAz Z~iTbw̛T5zì.mE~:@ aM{h}t;ukC{K"aFvݽ3tm[>3h%H<>eTb,4I\ȁUٵ-Vuy;<uz}a+6u%n,n\:C9OrfrMbzĻB!1 2A&]QO#N1+#NX)2uhN1Q0o!FmپIJ&D'_NǤ8#Ha(v6q={<@rQacn%݊61r1X|P\$L
8ɆM`h2r!Z;;]p㡛q5D#Df]b^)9`<
s7X3^K#Nu#$ I <5@C!2|^%lD[3d*qH'xDxhH9&hmA60'Ϲ2qdu$#H=#S7MPr)lg̃. ѽN `gݢ[+dnrbq`aK(BytKHQ0ZHW(=_ite5oc":b(ܐMH*K3rA|Vu͐RG8}&a}EXP$}pE`Ŋ#HՋMأ'6CLB?gƂAllA$t4pbaP~^>n>ÕT-cPg8gڟb#HX'R6S(|FH0M!#N) #Nrי[7*g"ps#H $2%b#,G2dR;^fh-60 8mJ2g':IutBr^Usji,4:FJJ(FtRVPPP #NP!>&Ipu'"@=b~"id ѢJ*'jDA(L BLY8jBk4OFOh)%)(NgSHASQ EML0DMKSQ#HITD-MTE3RļV v#<jDQD2P1'9ȨI|d>mQN~X kQ.V])S#HH1kKOKinKp#<Ċ![i#٤?l3^NǷC;ޒC}Dh="3defh?7vFvߓ#HS0Ĺg5ʆH$ߟ|CH&ZsoxO5M`y=}PĴέ(x`<# h !!%085G^#ND3~%W&@cLy-.93(Și ֘cJjCiCN&ǦY"92`0#k5J0l?c7T1twgjxGzʥmTdaIi`#HL$̆-eVS%LM9 CgllV!uh(tXFRhe1%U';GliXY(ccfRD\p:ߚ)@ǵS$!lHVf}OMѮ)4 >b q`'!#Hurruuڶ:`pk\Ī٬#HERaOCN*i( Ha#N^"@Lkww9]1.*]pv3_ϗG#Nإ=s)t`>#1% /G8xeJ )Rti-#o0dOR0q)@s{؆"r1(*^{s&"{}E*Sn(#HꍐST.n\4%vbP z8*}{!d \#H'bQ$7ˢS=Y^T_(lx;Y#03=ȶ0c>5QF*"C6"^Zf'eY&ٕR\O|;qÈ4aaU mԓC4V|=ǰAns>Z}y3\<<|Q`{Le}ؘtAͱj/P`YO.뇦,o$'97`ԛb!p7Ps`&MMC"R@Tu5&%{IsQݗ \Ja%F(&EҎ*1@4iTb Ń#