From 597f9da3b04e4439b564e530f09b585fed09ee29 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Tue, 6 Apr 2021 23:22:52 +0300 Subject: [PATCH] waf: fix install --- .gitignore | 3 +++ appframework/wscript | 3 --- bitmap/wscript | 3 --- datacache/wscript | 2 +- datamodel/wscript | 3 --- dmxloader/wscript | 3 --- engine/voice_codecs/minimp3/wscript | 2 +- engine/wscript | 2 +- filesystem/wscript | 2 +- game/client/wscript | 2 +- game/server/wscript | 3 ++- gameui/wscript | 2 +- inputsystem/wscript | 2 +- ivp | 2 +- launcher/wscript | 2 +- launcher_main/wscript | 4 ++-- materialsystem/shaderapidx9/wscript | 2 +- materialsystem/shaderlib/wscript | 3 --- materialsystem/stdshaders/wscript | 2 +- materialsystem/wscript | 2 +- mathlib/wscript | 5 +---- scenefilecache/wscript | 2 +- .../compiler_optimizations.cpython-39.pyc | Bin 3741 -> 0 bytes .../__pycache__/enforce_pic.cpython-39.pyc | Bin 889 -> 0 bytes .../__pycache__/xcompile.cpython-38.pyc | Bin 12005 -> 0 bytes .../__pycache__/xcompile.cpython-39.pyc | Bin 12876 -> 0 bytes .../waifulib/__pycache__/xshlib.cpython-38.pyc | Bin 5860 -> 0 bytes .../waifulib/__pycache__/xshlib.cpython-39.pyc | Bin 5848 -> 0 bytes serverbrowser/wscript | 2 +- soundemittersystem/wscript | 2 +- studiorender/wscript | 2 +- thirdparty | 2 +- tier0/wscript | 2 +- tier1/wscript | 2 -- tier2/wscript | 3 --- tier3/wscript | 3 --- togl/wscript | 2 +- vgui2/matsys_controls/wscript | 3 --- vgui2/src/wscript | 2 +- vgui2/vgui_controls/wscript | 3 --- vgui2/vgui_surfacelib/wscript | 3 --- vguimatsurface/wscript | 4 ++-- video/wscript | 2 +- vphysics/wscript | 2 +- vpklib/wscript | 3 --- vstdlib/wscript | 2 +- vtf/wscript | 3 --- wscript | 8 +++----- 48 files changed, 36 insertions(+), 75 deletions(-) delete mode 100644 scripts/waifulib/__pycache__/compiler_optimizations.cpython-39.pyc delete mode 100644 scripts/waifulib/__pycache__/enforce_pic.cpython-39.pyc delete mode 100644 scripts/waifulib/__pycache__/xcompile.cpython-38.pyc delete mode 100644 scripts/waifulib/__pycache__/xcompile.cpython-39.pyc delete mode 100644 scripts/waifulib/__pycache__/xshlib.cpython-38.pyc delete mode 100644 scripts/waifulib/__pycache__/xshlib.cpython-39.pyc diff --git a/.gitignore b/.gitignore index e483e125..41099b16 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ lib/ *obj_* build/ +.waf* +.lock-waf* +__pycache__ diff --git a/appframework/wscript b/appframework/wscript index 26b2aa2a..d5126d96 100755 --- a/appframework/wscript +++ b/appframework/wscript @@ -36,8 +36,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -46,7 +44,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/bitmap/wscript b/bitmap/wscript index 83a358b1..dae3a16f 100755 --- a/bitmap/wscript +++ b/bitmap/wscript @@ -44,8 +44,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -54,7 +52,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/datacache/wscript b/datacache/wscript index 820f4d96..81bd128f 100755 --- a/datacache/wscript +++ b/datacache/wscript @@ -35,7 +35,7 @@ def build(bld): libs = ['tier0','tier1','tier2','tier3'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/datamodel/wscript b/datamodel/wscript index bd843d62..9ebce224 100755 --- a/datamodel/wscript +++ b/datamodel/wscript @@ -41,8 +41,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -51,7 +49,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/dmxloader/wscript b/dmxloader/wscript index 9da0a98d..3413b0df 100755 --- a/dmxloader/wscript +++ b/dmxloader/wscript @@ -35,8 +35,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -45,7 +43,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/engine/voice_codecs/minimp3/wscript b/engine/voice_codecs/minimp3/wscript index 722693a7..b3f0743c 100755 --- a/engine/voice_codecs/minimp3/wscript +++ b/engine/voice_codecs/minimp3/wscript @@ -30,7 +30,7 @@ def build(bld): libs = ['tier0','tier1','vstdlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/engine/wscript b/engine/wscript index 7c2a286d..ce4dc481 100755 --- a/engine/wscript +++ b/engine/wscript @@ -329,7 +329,7 @@ def build(bld): libs = ['tier0','vgui_controls','dmxloader','tier1','tier2','tier3','bitmap','vstdlib','appframework','datamodel','vtf','mathlib','steam_api','matsys_controls','BZIP2','SDL2','JPEG','ZLIB','OPENAL','CURL'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/filesystem/wscript b/filesystem/wscript index ceadcdb8..adfdd372 100755 --- a/filesystem/wscript +++ b/filesystem/wscript @@ -44,7 +44,7 @@ def build(bld): libs = ['tier0','tier1','tier2','vstdlib','vpklib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/game/client/wscript b/game/client/wscript index 24a26677..b4f81d2f 100755 --- a/game/client/wscript +++ b/game/client/wscript @@ -559,7 +559,7 @@ def build(bld): 'RT' ] - install_path = bld.env.PREFIX + install_path = bld.env.PREFIX+'/hl2/bin' bld.shlib( source = source, diff --git a/game/server/wscript b/game/server/wscript index 52721b72..f22a0a42 100755 --- a/game/server/wscript +++ b/game/server/wscript @@ -602,7 +602,7 @@ def build(bld): libs = ['tier0','particles','dmxloader','tier1','tier2','tier3','mathlib','vstdlib','choreoobjects','steam_api'] - install_path = bld.env.PREFIX + install_path = bld.env.PREFIX+'/hl2/bin' bld.shlib( source = source, @@ -611,6 +611,7 @@ def build(bld): features = 'c cxx', includes = includes, defines = defines, + install_path = install_path, use = libs, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() diff --git a/gameui/wscript b/gameui/wscript index dedcb95c..d508bbd9 100755 --- a/gameui/wscript +++ b/gameui/wscript @@ -109,7 +109,7 @@ def build(bld): libs = ['tier0','vgui_controls','tier1','tier2','tier3','vstdlib','vtf','bitmap','mathlib','SDL2','steam_api','matsys_controls','JPEG','PNG'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/inputsystem/wscript b/inputsystem/wscript index 4441a012..3ff6305d 100755 --- a/inputsystem/wscript +++ b/inputsystem/wscript @@ -35,7 +35,7 @@ def build(bld): libs = ['tier0','tier1','tier2','vstdlib','SDL2','steam_api'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/ivp b/ivp index 72b80536..be91ef64 160000 --- a/ivp +++ b/ivp @@ -1 +1 @@ -Subproject commit 72b80536ba0aceabc012224970488893c166a0a2 +Subproject commit be91ef6413e2ff771c4484f7d5bd009d3bb90322 diff --git a/launcher/wscript b/launcher/wscript index 6fac8ff4..7af6dd6b 100755 --- a/launcher/wscript +++ b/launcher/wscript @@ -33,7 +33,7 @@ def build(bld): libs = ['tier0','tier1','tier2','tier3','vstdlib','steam_api','appframework','SDL2','togl'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/launcher_main/wscript b/launcher_main/wscript index fd66e858..622952bc 100755 --- a/launcher_main/wscript +++ b/launcher_main/wscript @@ -5,7 +5,7 @@ from waflib import Utils import os top = '.' -PROJECT_NAME = 'hl2' +PROJECT_NAME = 'hl2_launcher' def options(opt): # stub @@ -27,7 +27,7 @@ def build(bld): libs += ['USER32', 'SHELL32'] source += ['launcher_main.rc'] - install_path = bld.env.PREFIX + install_path = bld.env.BINDIR bld( source = source, target = PROJECT_NAME, diff --git a/materialsystem/shaderapidx9/wscript b/materialsystem/shaderapidx9/wscript index 771519d5..168d8539 100755 --- a/materialsystem/shaderapidx9/wscript +++ b/materialsystem/shaderapidx9/wscript @@ -58,7 +58,7 @@ def build(bld): libs = ['tier0','tier1','tier2','vstdlib','togl','bitmap','mathlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/materialsystem/shaderlib/wscript b/materialsystem/shaderlib/wscript index 4f758024..7c6e2ab9 100755 --- a/materialsystem/shaderlib/wscript +++ b/materialsystem/shaderlib/wscript @@ -34,8 +34,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -44,7 +42,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/materialsystem/stdshaders/wscript b/materialsystem/stdshaders/wscript index ecf1c982..c4a82640 100644 --- a/materialsystem/stdshaders/wscript +++ b/materialsystem/stdshaders/wscript @@ -150,7 +150,7 @@ def build(bld): libs = ['tier0','shaderlib','tier1','mathlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/materialsystem/wscript b/materialsystem/wscript index 3daa0639..4bb7d2f8 100755 --- a/materialsystem/wscript +++ b/materialsystem/wscript @@ -60,7 +60,7 @@ def build(bld): libs = ['tier0','tier1','tier2','vstdlib','mathlib','bitmap','shaderlib','vtf'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/mathlib/wscript b/mathlib/wscript index 2b3ed24d..9dfc1d1a 100755 --- a/mathlib/wscript +++ b/mathlib/wscript @@ -1,4 +1,4 @@ - #! /usr/bin/env python +#! /usr/bin/env python # encoding: utf-8 from waflib import Utils @@ -52,8 +52,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -62,7 +60,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/scenefilecache/wscript b/scenefilecache/wscript index b59c2f3a..a63db9a9 100755 --- a/scenefilecache/wscript +++ b/scenefilecache/wscript @@ -32,7 +32,7 @@ def build(bld): libs = ['tier0','tier1'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/scripts/waifulib/__pycache__/compiler_optimizations.cpython-39.pyc b/scripts/waifulib/__pycache__/compiler_optimizations.cpython-39.pyc deleted file mode 100644 index 1dc9038b94fbeb10ef18c69a2fbc9e00be876da2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3741 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 YKN<_!oCY*$Zh9N<45L^n&T8s^0r_YM3;+NC diff --git a/scripts/waifulib/__pycache__/enforce_pic.cpython-39.pyc b/scripts/waifulib/__pycache__/enforce_pic.cpython-39.pyc deleted file mode 100644 index 4c8fad24908b93eab063bfa1b97a842b763e8d78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 889 zcmah{&2G~`5Z+zev4ffte$^*HvP5f%-Vj0*ry!&fkX)q7m*9HWjZK5!8FrNJgy0A2vg#~>)8xIjZ3 zV~i-F)+LGwwW$MNi(%TJ?j`z)W1D&r@|(XQ16^ZfrzOu)tkHtBt~msjHVBF$i0ob? zA1kY@Mgm4bM*Qgn{c^|xo)-lZwG=@m$^lD9GMFZ^zfX6w$(amfD)I_!lO)gTB0min z&q|T9UX`bN)o0~G(Y)lctveDB2n!G7|Hl$~zWF>lZ#|iC0jj2cTz*yyb`RjPbQAQ{ zv;jqv)^#EC;-8>gVDa<<4bT8nd~S&uB?gf(5;Lt`S=6HBJHcpy>^b87jmYD9&Xx9= zl^ELm#Nhw{ diff --git a/scripts/waifulib/__pycache__/xcompile.cpython-38.pyc b/scripts/waifulib/__pycache__/xcompile.cpython-38.pyc deleted file mode 100644 index 1afaee57b7c09057fd0a4d313fd38a21a2364ce5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12005 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 diff --git a/scripts/waifulib/__pycache__/xcompile.cpython-39.pyc b/scripts/waifulib/__pycache__/xcompile.cpython-39.pyc deleted file mode 100644 index cfb561d02cf6e8d8a66f02656fe9ea68d0579122..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12876 zcmcIrTWlOzTCQ7P-L^Zv#daL0lF6+zZab67WHPIGh~rCQHf~3;Gm|Npt!?+Iw%hKm z?wqQ2oT5D}WLQ9G*@2Y+!Gi4J8tz&N1W&AlgtRXRi5FDbHzdSJJOSdt61#l=sp@XG zFk^~YcS&fAjo&r~@47enDT9_O|!NnV;sOfE|m z*^p)FeaRk{CHje4C8+&CvX!e;qmtp>NOU57@V1sxMu_1O6?~`npjo>|uuZ#kU5o4q>YK+Q~b;=rHgBUr6+^EQ% zW~bN~`i`^HY#i@1mQH=F@#iY~>(t9SBl3~Gv+NAh*;#guy|y2*B75i9d3Ir6LGCqn zabISa*yWF<=Q90_^DMF=Wip=;ZZon!xNf;-v7BFb%(Z7`p<1bx$`;QkzIMO5?)b6Q zyt8%Jve7eMK(k#ets~#H%$db4HdiXRIU_xjn|rvtIA`YOzG&WCUYa+$4%KAT&xo?0 z^;0rHNf#w2DCtGQ%LEC_Oee9Z`pKSDp^cx82 zH^@fWDU29mW9&5EC)qeVgZD5|0q+r_1m2@W2fRx+oMDq}3N<>r%HF{HER#W{>wav;X1rQrIS#Iu777uh%|AjT;cga>^OtCE$PLMq z8X8i$p(0fp3R2b8=A;kDcO!0OFWQLgQ?FP<+Ke%2OXXv-^yI;lv4*@CXEIav60Wu{ z4@vuwD>t&4+)Id_>b|lY73Ho*bYJHG<)#|Z=knLz+l@71d)@mIzHnNz59VNTv?me5~zPwow~6VxYwqap2$ z?9-ROiQFjV__xFir^MKAxu;sA`r4zI1SWs$H>cSKrR_Qhu#$ z>9uOfc1!lU?pAeo!_s-R>gv^^9&DgYsC+3O|SnsN%51hr4|rDDBYTASJlb zE;%k$yn7on{|6q)J0GrV(lkqU$u-T%TjgpYUv}O_rrF&~J=j{Gd}wW#oKn^Pj8^E& zlR`+m;YaqCU43d3VssvM`GS6d`H@07Z?CT&r1QLD<=0Bt?YHyUjXY-uU59GCb2N}u zEl0P3X{TPRRk^EEzhb$XclDV&i{8zd2a9^y+P2DizV22ldA9@@%g^+uc}I6ZO%Uq> z)Ir^%98DO`~)T+gnR&^^zgiGR>snK552xI4a@ua*3STdkH08~Kv$Yk6MS z@cR#GTysA6-g`3-SA3=F_)$y?w({dP+cJq}ex#Up^JQP#1Yh}DE$?plQELa7b$ktM zWBUni?~oaG)Qf8GuiJ@bI@*9zA%l{BU)Ct`mg2v$N*X%wv9vC^K|; zz`dD=a|;is(NC2evxU~q@j#Nfw3y?h_B`w5@I&pN#MZV50z2xXuuDp4Tq~yvKedgg3#`v*NUNedy zub*@vK(6z&(9{IH=MdnS?IpNhjo|su4K?Ka%9TLUv4)+SH)sti z-axcq&sV{WE*r0a8BL!9<{uiaYWWQ`*oR1$3acC1dObDO%3fM&B4+Gl^IfoBjd)0>$B$%{!)xOgDlI)#0#Qi~QfdsYr zNBNcj{3r^rYG5Alp@zcKWScVR8v810WzJ(6;rRY(6k^yZ4T5Z;vgJO_cIW_vC``{R9_N>lFj(T7004G6SYT+0TLb(6?^cVnc1S3 zhs+j9CBp#BMMi=!5nv`LDHsk>VzkjFqrE&u2bsxXOyCh@{xUL5hOIAzc^A&15Z_Uz z?5g(VkkFTzx~thy5DISwXL1v6G>d*sZfHc7T@`L%bT1~-I9d}Rm;9sMjao;ScfoRj8^j;%&rh+*+%b%5Emf-$w<%O9|mNu+{EU?lnp-Bf*Bh z=8&n%FHzM6B$-HHqfoQa)B2*or}#uL&k>Xl5x&+7g*L`bn)c5yi9=l_NOK$(T2wqy zWkB)952O0!p&jTZ(I%7&bl*lMKsDEebiu!7Di8@TRiIMH1CfAfC#79EkQR)Hq9)Ri z_n}cU(VPc9yuh-AInu-ja@JSZN_Hj|piCf&EZa7=0wfuzgZ3ap&WMHj>!@xM9N5Mk zq2h1Q-=VkysgYrrr=7gk*|}r!v~RW+Ka7G4C9+3crtT9WG%PDvl#=6QLxO}Y3b$eA zVnxSUL??)NSbE(pl^sF1zr!qnK_`17hw0SO>m?{v3=<@}hD=DJQ6do$qe&j2`dX0l z38vT}A8lh9E$8)%{aMdu1J7-mXcTxmDtP2YBw*z>aX!SC0)id4GNn-X4lSjrzWZb^ z*<4Pc@c#k-pn(7N*E?6>#lmV&U4Q*`{$&FCIC#~<&d%Q-0l2FL@XpRl5L3)SV4QSY zh;gy!x$>s6hhUZ94rQNQ7&Yf5No!<91cLWt1UN;gh9m6qB{UrepBVFxXlx-=lfCXH zd}7*{AZ%$#f-vA*kpeboKq0yaZ3Q|mk~3m~59t77J3D~1>_@RBxK_oFmFz;f&a4jZ z{(vBD>8|5oh7Tjgo0#jL2z1gVlH&EXz-~2nz)rkOY$LF{fDGV;G6{H@50Jj6ZC99N zIyAk^Xhmv67Ai<_wM~QtMM^=zIP|z8^thHosDW3Eh%iOGvF2XqOyvV(4SVAh*&Vb; zCW8GVQ=*uLQA`A2U{y`3ybq} z=E?^v50{r$MX;jHot^9D>ll6<&G`lz{sm9Sr%5Q>wnrU)z91L@o#>C`sI{yGEOK3< zeOxR}=I0s+iU+hFlGf$7(Pm#n8Cs0rLmTO0XyGA=skE~bPoSSl{m=?z>_tQ?9exD0 zGXDs*(S6Cm8|GRZLD-MbHxbMpgwl6Oe&ZtOIe}gYmfBMI_ZkWgPr5%9P=s@Q8*jkk zd>b?L1TzFR{JUZe$t@WSgiD(Cmpqu>P{qDrQh>$8WG4KZ|0cKsLqUth<+SX*)l^l% zjP1bf51fae#zdLOK`dKwH|mu&FPW_rYxQZ{s@ed$Qb4|d2&@G+@tuRS*|~c&@6DU@ z3k!?0i}Sfv^HFZ*{^H#nWN~J8c7A2$pf5Z3-u&$9^20@A-dtJC%`UHaquI(f0!md5 zoM&kjS(-lkq@HIP4fF^Oua;(3@0qz}b7gs9b>YGE8(tcqP|Pg|u*g=B^0Al8y;>PqGNP zMTs!Bb;=2qeU@@>P_jq~dCzd7$#Udtl$0s4Dd{w)MZ>?L-l4v*o#CDgz;ad)=S+Ps z8W~cCHZ8vAul-AAuB*ilb=6cmqBv z@-W&$NkC~+aaE|1TWD*kJ0T^qh)mG9_s~Wvt79CgKBpMYTtg2n7}b!W#v(#h;E)7T z28+Ben}v~=ZP~(57`EH zL{vi&)NN)J5p`wq`inclnBZaDMK^gPr%>Z64HE> zP<8Y=kL@B1Uckwr0JJ6Lcnf_ zyTI)5Kox8_*c1q_a3+O9ZjLj8agKquSZf@%Dej>LXSP9aI-6t3CQU$xE_g=SGU&i5 zyyu+&ZgFa{HcbYB%L*`GNwFX})E2+Dvw2>n%KiZNKyJ3FT5ftnErQT_L$*?KAaaEb zDE)FpgwQz0SeSJ}dW1dNmL3wECK+O7oD|_m{U{N((dRl5VHg>5uYh=@kO3hZBo|4! zz5j=^WR!)4jJ%LJN5>5mOE678X_}QPtCuOCGEJzla?oRp`6gBfl)7 z))*eavA2;SPNl;K@T`pZ7Th`95rA|fyb+-jU$i1tMaB?X!Fgof;Ff@B6|u|iT#Gz< zwMJVuZTZdcC7qd8x#g#t`gr-l>WarLTb$$4&dcZ|hK~J08+w8Y;Ic2k4GXKLZ_x(u z?!>K@c0nFze(z4`)=nPBHrCw5;#Yc?uSSsAnAqV$^ZLdna5*;O~k9Xq(nRuL9?(gxMxIiV<;u)j>B_J z!?(>i3}tmMAwmpEmb@jQ1OpeafX_q;=BX&9P?9#gHEFX4eR}s{4l9z`6V|1vj&<+D zv_@?@tUZC+zOX0VOrX*Is2d3D`st3tX16(rx*=f(kC72B>Q358*4xZ8ntzz~RM9qq zHII@R-B34A;Ta>xabFSgGRped0I(on+?V%GQy(@6f2!F&6t)AhW7|)L?SS%VJEJ&s zw>fT?@s>8ve4_C4Y~<&qpOuQTxPcRAV|2en^wLEwZcTk0XXC9}x*3I=I@DwHY^(Mh z(_uvq?NV^_wT6b9Q@A_zHC2{AQJ%n6rf-Qk&$#E=Yizg#-oWjd3!4`)Y5@0OkZVN2 z5s^mp7LB>nK&yFCXo&N<19^gXgX6q&i}rTDTw-n6)@ym5hqzlD*E`B}>nt|*JLnn& zoqvRKv}f@#N){*qvrFEY=8Xo@3=k}5QeO#fC0Gna?kN*GA3@L0$XfE1*;!wmef-#n ztgJpLpw^x6_uZZbe#;ZsI;}i3x(4?7XA*B7xLjqu!tA8x0;ja-~ykVc3-3LTeiO$T2VfCv~m0oiT=qIuCLF7^f2Ab|3< z+FIVRj0p0ziV-hY*G-DY@}I(|Ns|LUUxoear;wn4cow!2qwBCQd`akP{u8wR2_zVW z+eH_tc!?5H?>tKhu@TQxLhEar8oo-GTB5V$<*W!d#E*mJMbS@?FBY_r_2I|v&jlqi zLyV~KAD4uy<45i<-Z7W>5_O9{csReX_}Et~&U)Ks@?+dW?5kiI@ws`NMJ=yf6KgfP z;aT2)ggSUxcOM%m%=Cc#M^Wl&fgsAbJxMn*Oc<*az2Oo1UhmS(?89XoZkaUk@=7M= zYs8g)R450>=o0Ef9PT**CcaLCf0G8wTLJw94~Y#j(cHEIna9 zkupX^H&p)=q@Xgc4~p#qaVJsMg7PL#lK2K{Vw-W{9#CG!wuS41Wawjaqw9xMlWf)C zimq_N4ic-uovG!OgJhVUeemd@JIvz*pjdIm?NZ?z&%c zA5a*x_+6sv&SGw1Y4s4Z3U(w1%sA2HHWTq*X9E)(>5$D@H7{iTTlA4m@$ygAaEGRK z*Oq#RH*2AczCxr6teZ64gEUB#0{TIK7nteQ1h|gY&r1M-NG-=dB^ZC3lHWlB|E7f* z{<~EBdzAb>C4WH4k=2YGSxtK_zd&n=V~9j6!CLqqA`fdY)x3s8Yxk4w(o5^3y+AM+ zDK-}?d=9(J1(VU6;OF;(DTmsV97dLp}C9DN5hv0~VyZQJz<%RqK=i4upBHz~pYScLoRS1Gqo38|QXGyjNke~iSB z;r=LLmH!D<(K)%02TttA|624YT6wyu2b30J*_sv0-Ka9Zd(8qdt*|K8e+Y#wW5bW% z3L+Wr_FyvSHj+Mh80sRp{y=B(?XUoFs`mV(^pn!1cmkn;u6QhshzWK#Ev}(IMN!cE Fe*j;y49oxk diff --git a/scripts/waifulib/__pycache__/xshlib.cpython-38.pyc b/scripts/waifulib/__pycache__/xshlib.cpython-38.pyc deleted file mode 100644 index 2966c6098e649c58e0dd85bcf2652637254ec47f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5860 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 diff --git a/scripts/waifulib/__pycache__/xshlib.cpython-39.pyc b/scripts/waifulib/__pycache__/xshlib.cpython-39.pyc deleted file mode 100644 index f9733c6d75f1c54c85fab096e253ea21b0aaf6ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5848 zcmd^DOLyDG6~>DMNzr;)b{zLKL0l^dT}yJ4Hc4a0HBH-!Vuem6rE%cnq7Vk8K#>GJ z1KKi0c4M7mXOZ^wA4uKh5A?@i+f~=yW!3KvK#H>DHht_$9t>vg%wT5j_syMq$31nb zpx}4skN1D~=4nOwD;36n1`0Ruh`%6V3R9a(OSRROW@|0o)?0>cs3g~#nO4@$woKb> zQi8GhaqQQ^e+mE4G*Yc5G0lq{ms$<6#)Zsu%0t&W>&DxMIswsc-tDd=^gy zk2s5@uQZ?%rZJr<%=lKS0t05Mz3GJo5xG&|Ei{AncF?ZJ84-otk0;kR${Q;cXLY4| zccr>anY zV5xsr*OWgf>4LQC_v&R#_zb$F6LveD=2IsDJ)Zcyyi#>;u2jowUjzA0Gax|q%_e(! z!kNu(&}2WxcLeP<1(W4(;O$Xi{6`qwz#}XqzGACPv4MfDGtGvs?M%AcvMdXYoAGO@ zvK{U>L(h%e&8F`F{N5Grx5CH1Y0kE zYgOC4x7nzGC{kGjweXwApfzaK`6nA4I+KD zR7f^8*~K_dR$3Y-SZVZVvp8S(+dg+;%VUFh9#2V26>^99UekqzpAddTROxgh5lE@D7i=p?Iuo^kiSF8&nc1IK1?Lb-$eyI<1E)W zNsh6cw)hQdN;5ldx#)a|r@YkGrxvt#R@y}?v8R@2rPb~dz6J^d7pGDI&(j8pNJ4co zl}G%BNs|0NW}47q?Thlpr_TDu$1+17y0ZpSe06W_?y%;F;7AMVH>#zY@>)fHjNVjU z-&kF_>3m*ZyL)?WR33g;R#IV9L*J9qL&;%Zd}-J-%~C7+K6>FLOSckzRKLrdh_VFu z5Y|Hr_6y*2jQ}H?Ocsojz+xNz>y?_7J;NHLgvZ2D-D~a^~ z5MEB6*@>I|=OjICifQrS8lY1`-^d|1Tz z827C5C+(4eWvM-QSCP-#SP;2jk#wKt#n8KY@bId{?mI2k7O%vrKZayt->=c&UfAkf zuVSRX<57Co$KB1vYvkcI#r4G}Jcy*12WKGg1^hh`9o8Ox=-4_)hjJa{BFlA5C+p~| zq?^%N&hJ_m=Ea4}*4yML90{#hP_eg#nN$&5Yr z!+GnpL+0E01Tic=HWR%g;**+(ADNLZQ!+iN+qshz_8Dd=k2OU%aBkw{y!6Ah?dj+} z{86w-kJRicGJUY{0IWMu209pt$VoC%Pg#mU1G0prLmBwFuY;vPNN=*5Jj@BBcOn8S14(WYN3`b);Uw1w_8F8r zVI97;(?#foo&MP6M-49-45HC#JmLis^7vmU@cs7~jPAqp16BI$DkPJr1F`$^!r)O- z8jB3}GuRS{3&>29m%ne)_UP;TxdX)8cxRb`I^%_mFJP{XXS%9H`TYV~PaLRyqprS& z@tp~lfx*r8K9ZUko+CBH2)GZBCrQwzYZ4fi_O`R-H#g$r)H`*gU$s=^pQ2%$OGglKHVLiyPpLmSCUY5v2kJIok@e_622L^t^Snhvkfj>4X2pa738)WHCoicKqabfU zCJ_%z;~s==LnhVUg_G$r{s}N7_1*YKG!l7%oIHqQ28E2AWP&tuk_p=y|MUgn3FLt< z%-sPz166rJ?6?SafIbZvwMJ$?OU!7PjU3ZnSL*7Ail#WmqYF%@(4hAL;uU#WF&^(C zlA`-A!mi~8ZEG`VBm7Nql&5v?{LnZuy7r*x7*P*SV6nKxDI}?u@)AD@6knsY{hE?5 zDWMCQc$&bA@EK?Gsk}4bKO?c326sTgqOuy{7SEt*B&ghma150k#aqnph;7J|a|MXZ zAu{W|@d^ym4%L#*X^+Kb%CI=Q=_9`NO9p>PgGdrcL-yO@m`AE4Kjd`CitzJDmhlL( zF0dQWxaqe1j eVRL;FeI&cjL6e4-({pCdm^EkTW{ug*dF>zdIlI^Z diff --git a/serverbrowser/wscript b/serverbrowser/wscript index 9af6519c..1dc3cb8f 100755 --- a/serverbrowser/wscript +++ b/serverbrowser/wscript @@ -55,7 +55,7 @@ def build(bld): libs = ['tier0','vgui_controls','mathlib','tier1','tier2','tier3','vstdlib','steam_api'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/soundemittersystem/wscript b/soundemittersystem/wscript index 82df5bf9..9a8dcf0a 100755 --- a/soundemittersystem/wscript +++ b/soundemittersystem/wscript @@ -36,7 +36,7 @@ def build(bld): libs = ['tier0','tier1','vstdlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/studiorender/wscript b/studiorender/wscript index bc0dd0b5..60277910 100755 --- a/studiorender/wscript +++ b/studiorender/wscript @@ -43,7 +43,7 @@ def build(bld): libs = ['tier0','tier1','tier2','tier3','vstdlib','mathlib','bitmap'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/thirdparty b/thirdparty index 31ae58f6..ecce0cec 160000 --- a/thirdparty +++ b/thirdparty @@ -1 +1 @@ -Subproject commit 31ae58f64f9169db7f4e02c83dba46e5a47e0c7b +Subproject commit ecce0cecc39b32bdf704542e3cb870ba4e2e8e42 diff --git a/tier0/wscript b/tier0/wscript index bf4a18c2..9f6e39bb 100755 --- a/tier0/wscript +++ b/tier0/wscript @@ -67,7 +67,7 @@ def build(bld): libs = ['DL'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/tier1/wscript b/tier1/wscript index 61b4810c..0df2dc4f 100755 --- a/tier1/wscript +++ b/tier1/wscript @@ -75,8 +75,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, diff --git a/tier2/wscript b/tier2/wscript index acde70d8..3e83666c 100755 --- a/tier2/wscript +++ b/tier2/wscript @@ -49,8 +49,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -59,7 +57,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/tier3/wscript b/tier3/wscript index 045354b6..d92e8011 100755 --- a/tier3/wscript +++ b/tier3/wscript @@ -37,8 +37,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -47,7 +45,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/togl/wscript b/togl/wscript index de8a3229..bdce47f3 100755 --- a/togl/wscript +++ b/togl/wscript @@ -46,7 +46,7 @@ def build(bld): libs = ['tier0','tier1','tier2','vstdlib','mathlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/vgui2/matsys_controls/wscript b/vgui2/matsys_controls/wscript index e4060854..258f608b 100644 --- a/vgui2/matsys_controls/wscript +++ b/vgui2/matsys_controls/wscript @@ -50,8 +50,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -60,7 +58,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/vgui2/src/wscript b/vgui2/src/wscript index 951fd9b4..f4e5547c 100644 --- a/vgui2/src/wscript +++ b/vgui2/src/wscript @@ -52,7 +52,7 @@ def build(bld): libs = ['tier0','tier1','tier2','tier3','vstdlib','SDL2'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/vgui2/vgui_controls/wscript b/vgui2/vgui_controls/wscript index bb87e435..4962d364 100644 --- a/vgui2/vgui_controls/wscript +++ b/vgui2/vgui_controls/wscript @@ -106,8 +106,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -116,7 +114,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/vgui2/vgui_surfacelib/wscript b/vgui2/vgui_surfacelib/wscript index e3aa859d..44dc4e78 100644 --- a/vgui2/vgui_surfacelib/wscript +++ b/vgui2/vgui_surfacelib/wscript @@ -38,8 +38,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -48,7 +46,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/vguimatsurface/wscript b/vguimatsurface/wscript index 2e1dd39c..90ebb812 100644 --- a/vguimatsurface/wscript +++ b/vguimatsurface/wscript @@ -45,7 +45,7 @@ def build(bld): libs = ['bitmap','mathlib','tier0','vgui_controls','tier1','vstdlib','tier2','tier3','vgui_surfacelib','FT2','FC','SDL2'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, @@ -58,4 +58,4 @@ def build(bld): install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() - ) \ No newline at end of file + ) diff --git a/video/wscript b/video/wscript index fee20855..30d7a560 100755 --- a/video/wscript +++ b/video/wscript @@ -31,7 +31,7 @@ def build(bld): libs = ['tier0','tier1','tier2','tier3','vstdlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/vphysics/wscript b/vphysics/wscript index d2c5d994..fb6d4fa2 100755 --- a/vphysics/wscript +++ b/vphysics/wscript @@ -63,7 +63,7 @@ def build(bld): libs = ['tier0','havana_constraints','hk_math','hk_base','ivp_compactbuilder','ivp_physics','tier1','tier2','vstdlib','mathlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/vpklib/wscript b/vpklib/wscript index be5aab32..1210aac6 100755 --- a/vpklib/wscript +++ b/vpklib/wscript @@ -32,8 +32,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -42,7 +40,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/vstdlib/wscript b/vstdlib/wscript index f97ea542..730ab25c 100755 --- a/vstdlib/wscript +++ b/vstdlib/wscript @@ -40,7 +40,7 @@ def build(bld): libs = ['tier0','tier1'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/vtf/wscript b/vtf/wscript index 154cb5ee..3698d0c4 100755 --- a/vtf/wscript +++ b/vtf/wscript @@ -34,8 +34,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -44,7 +42,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/wscript b/wscript index ee042686..f408f343 100644 --- a/wscript +++ b/wscript @@ -1,6 +1,6 @@ #! /usr/bin/env python # encoding: utf-8 -# a1batross, mittorn, 2018 +# a1batross, mittorn, nillerusr from __future__ import print_function from waflib import Logs, Context, Configure @@ -104,8 +104,6 @@ def options(opt): opt.load('reconfigure') def configure(conf): - conf.env.PREFIX = '.' - conf.load('fwgslib reconfigure') # Force XP compability, all build targets should add @@ -219,8 +217,8 @@ def configure(conf): if conf.env.DEST_OS != 'android': conf.env.LIBDIR = conf.env.PREFIX+'/bin/' conf.env.BINDIR = conf.env.PREFIX - - conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX + else: + conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX define_platform(conf) conf.add_subproject(projects)