@@ -71,26 +71,32 @@ <h1 class="page-title">Source: Engines/Wine/Verbs/DXVK/script.js</h1>
7171 .to(this.prefixDirectory() + "/TMP/")
7272 .extract();
7373
74+ var forEach = Array.prototype.forEach;
75+ var sys32dir = this.system32directory();
7476 var dxvkTmpDir = this.prefixDirectory() + "/TMP/dxvk-" + dxvkVersion;
75-
76- cp(dxvkTmpDir + "/x32/d3d11.dll", this.system32directory());
77- cp(dxvkTmpDir + "/x32/dxgi.dll", this.system32directory());
78- cp(dxvkTmpDir + "/x32/d3d10core.dll", this.system32directory());
79- cp(dxvkTmpDir + "/x32/d3d10.dll", this.system32directory());
80- cp(dxvkTmpDir + "/x32/d3d10_1.dll", this.system32directory());
81-
82- if (this.architecture() == "amd64") {
83- cp(dxvkTmpDir + "/x64/d3d11.dll", this.system64directory());
84- cp(dxvkTmpDir + "/x64/dxgi.dll", this.system64directory());
85- cp(dxvkTmpDir + "/x64/d3d10core.dll", this.system64directory());
86- cp(dxvkTmpDir + "/x64/d3d10.dll", this.system64directory());
87- cp(dxvkTmpDir + "/x64/d3d10_1.dll", this.system64directory());
77+ var self = this;
78+
79+ //Copy 32 bits dll to system* and apply override
80+ forEach.call(ls(dxvkTmpDir + "/x32"), function (file) {
81+ if (file.endsWith(".dll")) {
82+ cp(dxvkTmpDir + "/x32/" + file, sys32dir);
83+ self.overrideDLL()
84+ .set("native", [file])
85+ .do();
86+ }
87+ });
88+
89+ if (this.architecture() == "amd64")
90+ {
91+ var sys64dir = this.system64directory();
92+ //Copy 64 bits dll to system*
93+ forEach.call(ls(dxvkTmpDir + "/x64"), function (file) {
94+ if (file.endsWith(".dll")) {
95+ cp(dxvkTmpDir + "/x64/" + file, sys64dir);
96+ }
97+ });
8898 }
8999
90- this.overrideDLL()
91- .set("native", ["d3d11", "dxgi", "d3d10", "d3d10_1", "d3d10core"])
92- .do();
93-
94100 remove(this.prefixDirectory() + "/TMP/");
95101
96102 return this;
0 commit comments