From 3df708d500f40efda7efe8ca716eee6218697311 Mon Sep 17 00:00:00 2001
From: Mikhail Paulyshka <me@mixaill.tk>
Date: Tue, 14 Aug 2018 21:12:58 +0300
Subject: [PATCH] [build] reduce the number of d3dcompiler versions

---
 lib/d3dcompiler_43.lib   | Bin 0 -> 4264 bytes
 lib32/d3dcompiler_43.lib | Bin 0 -> 4490 bytes
 meson.build              |   8 ++------
 src/d3d10/meson.build    |   6 +++---
 tests/d3d11/meson.build  |   2 +-
 tests/dxbc/meson.build   |   4 ++--
 6 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100644 lib/d3dcompiler_43.lib
 create mode 100644 lib32/d3dcompiler_43.lib

diff --git a/lib/d3dcompiler_43.lib b/lib/d3dcompiler_43.lib
new file mode 100644
index 0000000000000000000000000000000000000000..201bab8a3eb251eedbb3ef2e335f208a3408d751
GIT binary patch
literal 4264
zcmcIn&2AG(5Uw~766cq&mjx|rb|bMXf#Y~Q&LXW=PA~$CkVJOiLZtD}Ot6s?TjR-<
zy+s^&2A*IaA}7R=140})?qQF-0sGZVx2FfU?TiR5mAj{^y1(w~s_OEMKWlEI`B!o^
z6>V##ku!`;cI}TSKO;W#cd}wsO%l;HqNz=y>6b(^Z-{2of?lHs&CLmVfu8AeK=XAX
zpFW@mE$j>Wh#s`~M9^FGprt&MWtAT7?v(ee;=Rh<a%p#Or)=4V-RK;4TW!a+at2w}
z_T#OsK|T6Asu-y4J$StR&?;{1ZBWrDZuEN2VZH5Ok=9|?QaKpk4NyX%WU$P2YM!&%
z?$i}=$b&|))vFCGuQH)?-|={f-J0u#%c#sir|8s=pOuadIuWIi8)%h|y2swek-c;5
zVNhv3JF0od?pJ%n;-mDGmBuU(6$kUiA?xIrx$8Pzx6^QXz3_Yr4;p3XpzSmi8%YLa
z70+#TE6tkixZ!k_8Q0&}GoimP!r?ckh+a+;y_q3O&l0@`v6sI9eFoL%i9Ue#7l=NB
zo?y~jP=3h|7P>$eX^Jk<G|f<wW@(P*X@M4Lf)YbzlM(O4DfO-g!3d9n6xSWcO@bM|
zgPiq#F-3n@5U98CEs;DJoqdk9OUMX=u+LL%)Mu(;rZPi&soYUPGoTl>ohsHvKwqxd
zvCor^-e;&b9hc!&zjFO?nSSk#d;zM-X!1<k?KUM><&z-P#;s>&!$`7ECh7S_@9EVE
zyd8)tZfTnn+e#()B6@(qEBPV%0xfN(TXxN>tz@O>2MpeW{u7Kz^aaYC3O&3WL1Vos
z;7L8^7ASR^K>s76k=yd%L2uHPrArXK^A+$sAy});<wvcC+v#-<ywq>y-&0$q?T11h
z>5veJ_rpYpZyq5LAP4Yh5DYtN;GMzNtIdgtFJIJ|m_oeQ1W5}Ni2U6*CC5K&fG2cv
ztb<9^*D*s5^KbHxXuLXh;Qt0c394f7EzvsGD`R?5)?Dw`ANEPY_o7qmG1$A_i)_f%
zrg)Jd`RpD4$Pdx87xB8^%RA0;*FOP&Xi*b8291m~H)2}E;J-i^WxWwGXbMC5G0ZWj
zwgMGo4CW-CWBrr-5IyUCFDswL!YkOvd3&k37UoVOj$`|T^WD$DLJEq!=b9`K`(90X
zttqa`L%i$2;(UPTSH6uJxY(K8(4X!GkT|n3TKMp40OOx8r$_t+XzWu!RG)PXWb8AJ
zK;*Xqh-%Gn9*Cy?jK2bn|7rz@VL_sSjBVHTAvei^jlx!7jw*M~V;A`$w!VcO@CzE8
zTvLc@z~kO?eu&j?0~ckyz}8i28t~ZmH;34tBME;V7+t9Y&joQrrr`fKK$KOc1}?63
R%^^3-aeFyHQ%hJ4;{TOr&olr4

literal 0
HcmV?d00001

diff --git a/lib32/d3dcompiler_43.lib b/lib32/d3dcompiler_43.lib
new file mode 100644
index 0000000000000000000000000000000000000000..d5578505e11648550a9154a908bafca1a3d44c8a
GIT binary patch
literal 4490
zcmcIn&2HO95FW{mQ_H_eb7_MDYU?IW5ZDqW$~IsWbfTgWqS%Jy<kABrOLQbawgiek
zx5zmU5#$*3lqc{p570voJ>}G=Ncs)QrIvq^n8*tZmz?>y-*R?lcKO3z(`<Eq$!ul)
zEw2`eg+fj#=KOl`xV=+y4UG&D-6op<NVHHU%Dg06{NTvab0S;bqlYZ-x$+J@WM#vZ
z*XSXu_g#659<uhpl{e@iH*T@$dgbZSVeMEi|5|@ks~jC4*7SCv-RhqWx;?|xiv`m4
zgJ;!h7)O8jfe!5W@w0;`dU^kNpY(E}ygwWoXD2;FD<~MKdp6KRTA&^|bXu_}fn+6P
zOrvQT4}1L+ZAV7=)WDUy!=@lrauPCV0QNV-;sKAErlt9?L4$)W8z&bpD(9ztEiZo!
zz<!H^uAC1pto`%$;e~~pdiTY7)4DL7F9^Or2`h~_#Xw<*^Zqn5iNj!oBhwg|{gyEt
zYKpuB0X>j4<FseAEG=J>{4Xnksas}uQ13L`hUv!z42iR8ca%-5NT-kUMCApdm&mOT
zi$u?th~7i?mWkd$HdcsUL+%6o7V=<?=ndr74LcR-E4oJWbe+DY1<KGOEzvTq&?==U
z9c!Bl$3DJzY(T?4MSueJnbGFFX~$X8@W89%ml%M+qJ2qOi769a@sQm(Qu@k(rw+Q*
zGXxV{Hu#fSwoFRX5H{>;84{Ok9wy*+PcNsErwlB?r0TpCNUTY_RDM_NUX6^u@Nc$z
zJ<4o}?aYNu8c$UeZ`Z4)=IGCB*6-h?2zh3=)MlHj?RwpLBzlaSSK`6#HClVP*=;wi
z=DH$G*w*N8$bYV44!uUXOBYvi)x@}Y@Ch92HOgM5(SM6v=XNvvp?B$<wd*kPu-v#5
zG&(n*c3WnD*gv(h8?}4cYUSXGWA<NBcI+2<07CU3)D@H(R2aSslVL_JY>k+DqmxQ~
z`Xp%iO>R8bGzkxAME2}ELSug`PjpUbij0ARJd8Thu>LMz+{UA02KLptq^W_MFG=o+
zQJFA`6m?sQqO=`Fmzbk7cZ!UnHtcefqNpJB936j&2e;=a;&HDkI;L6c@4+8?AWNKs
z%5FFZ{{_Q1?~Tbp)pe8|*_?xNlX9>q^c=_khzGa73NKIN*>&*GIyzN#R5OV<f2%33
zb3cI#r6+Vsh^PRG*HkS=bN&cEt_6JlmbTCc%EXmi9JsRl|1$bY_9$02n^E4MXTiA>
z{grpX$2$mf1~&gIX5}4&Spz4FS+Ghwuk2s0)o{3A^&MLxXcI@$wkWNEb=?Ig4$^{m
z!l7suGbzQab`G=PJ=OJl^yxNY0!bsh6te<(aN`$3@W-6zA|{Y{Exc_muogdq9X~Jj
n4E(3XnXrzjCH!y2ewWUo5tK<it;Vc0=QV!FY{tMrH-hzl6GQ)%

literal 0
HcmV?d00001

diff --git a/meson.build b/meson.build
index 13114444..6a0043e2 100644
--- a/meson.build
+++ b/meson.build
@@ -29,8 +29,7 @@ if meson.get_cross_property('winelib', false)
   lib_vulkan  = declare_dependency(link_args: [ '-lvulkan-1' ])
   lib_d3d11   = declare_dependency(link_args: [ '-ld3d11' ])
   lib_dxgi    = declare_dependency(link_args: [ '-ldxgi' ])
-  lib_d3dcompiler_43 = declare_dependency(link_args: [ '-L'+dxvk_library_path, '-ld3dcompiler_43' ])
-  lib_d3dcompiler_47 = declare_dependency(link_args: [ '-ld3dcompiler_47' ])
+  lib_d3dcompiler = declare_dependency(link_args: [ '-L'+dxvk_library_path, '-ld3dcompiler_43' ])
   exe_ext = '.exe.so'
   dll_ext = '.dll'
   def_spec_ext = '.spec'
@@ -38,10 +37,7 @@ else
   lib_vulkan  = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path)
   lib_d3d11   = dxvk_compiler.find_library('d3d11')
   lib_dxgi    = dxvk_compiler.find_library('dxgi')
-  if dxvk_compiler.get_id() != 'msvc'
-    lib_d3dcompiler_43 = dxvk_compiler.find_library('d3dcompiler_43')
-    lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler_47')
-  endif
+  lib_d3dcompiler = dxvk_compiler.find_library('d3dcompiler_43', dirs : dxvk_library_path)
   exe_ext = ''
   dll_ext = ''
   def_spec_ext = '.def'
diff --git a/src/d3d10/meson.build b/src/d3d10/meson.build
index 4218bee0..a6b7fbed 100644
--- a/src/d3d10/meson.build
+++ b/src/d3d10/meson.build
@@ -6,7 +6,7 @@ d3d10_main_src = [
 d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_main_src,
   name_prefix         : '',
   link_with           : [ util_lib ],
-  dependencies        : [ lib_d3dcompiler_43, lib_dxgi, d3d11_dep, dxbc_dep, dxvk_dep ],
+  dependencies        : [ lib_d3dcompiler, lib_dxgi, d3d11_dep, dxbc_dep, dxvk_dep ],
   include_directories : dxvk_include_path,
   install             : true,
   objects             : not dxvk_msvc ? 'd3d10core'+def_spec_ext : [],
@@ -16,7 +16,7 @@ d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_main_src,
 d3d10_dll = shared_library('d3d10'+dll_ext, d3d10_main_src,
   name_prefix         : '',
   link_with           : [ util_lib ],
-  dependencies        : [ lib_d3dcompiler_43, lib_dxgi, d3d11_dep, dxbc_dep, dxvk_dep ],
+  dependencies        : [ lib_d3dcompiler, lib_dxgi, d3d11_dep, dxbc_dep, dxvk_dep ],
   include_directories : dxvk_include_path,
   install             : true,
   objects             : not dxvk_msvc ? 'd3d10'+def_spec_ext : [],
@@ -26,7 +26,7 @@ d3d10_dll = shared_library('d3d10'+dll_ext, d3d10_main_src,
 d3d10_1_dll = shared_library('d3d10_1'+dll_ext, d3d10_main_src,
   name_prefix         : '',
   link_with           : [ util_lib ],
-  dependencies        : [ lib_d3dcompiler_43, lib_dxgi, d3d11_dep, dxbc_dep, dxvk_dep ],
+  dependencies        : [ lib_d3dcompiler, lib_dxgi, d3d11_dep, dxbc_dep, dxvk_dep ],
   include_directories : dxvk_include_path,
   install             : true,
   objects             : not dxvk_msvc ? 'd3d10_1'+def_spec_ext : [],
diff --git a/tests/d3d11/meson.build b/tests/d3d11/meson.build
index ac3cf0ff..b0475d16 100644
--- a/tests/d3d11/meson.build
+++ b/tests/d3d11/meson.build
@@ -1,4 +1,4 @@
-test_d3d11_deps = [ util_dep, lib_dxgi, lib_d3d11, lib_d3dcompiler_47 ]
+test_d3d11_deps = [ util_dep, lib_dxgi, lib_d3d11, lib_d3dcompiler ]
 
 executable('d3d11-compute'+exe_ext,   files('test_d3d11_compute.cpp'),   dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std])
 executable('d3d11-formats'+exe_ext,   files('test_d3d11_formats.cpp'),   dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std])
diff --git a/tests/dxbc/meson.build b/tests/dxbc/meson.build
index 23782227..35638b2f 100644
--- a/tests/dxbc/meson.build
+++ b/tests/dxbc/meson.build
@@ -1,6 +1,6 @@
 test_dxbc_deps = [ dxbc_dep, dxvk_dep ]
 
 executable('dxbc-compiler'+exe_ext, files('test_dxbc_compiler.cpp'), dependencies : test_dxbc_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std])
-executable('dxbc-disasm'+exe_ext,   files('test_dxbc_disasm.cpp'),   dependencies : [ test_dxbc_deps, lib_d3dcompiler_47 ], install : true, override_options: ['cpp_std='+dxvk_cpp_std])
-executable('hlsl-compiler'+exe_ext, files('test_hlsl_compiler.cpp'), dependencies : [ test_dxbc_deps, lib_d3dcompiler_47 ], install : true, override_options: ['cpp_std='+dxvk_cpp_std])
+executable('dxbc-disasm'+exe_ext,   files('test_dxbc_disasm.cpp'),   dependencies : [ test_dxbc_deps, lib_d3dcompiler ], install : true, override_options: ['cpp_std='+dxvk_cpp_std])
+executable('hlsl-compiler'+exe_ext, files('test_hlsl_compiler.cpp'), dependencies : [ test_dxbc_deps, lib_d3dcompiler ], install : true, override_options: ['cpp_std='+dxvk_cpp_std])