add d3d.dll to windows ports

mac
Miepee 3 years ago
parent 3ea261fc0a
commit a15258932a

@ -38,7 +38,6 @@ public abstract class RawMods : ModsBase
if (exeList.Count == 1 && !exeList[0].FullName.Contains('/') && archive.Entries.Any(f => f.FullName == "data.win")) if (exeList.Count == 1 && !exeList[0].FullName.Contains('/') && archive.Entries.Any(f => f.FullName == "data.win"))
return ModOS.Windows; return ModOS.Windows;
//TODO: any uppercase files should be invalid!
if (archive.Entries.Any(f => f.FullName == "runner") && archive.Entries.Any(f => f.FullName == "assets/game.unx")) if (archive.Entries.Any(f => f.FullName == "runner") && archive.Entries.Any(f => f.FullName == "assets/game.unx"))
return ModOS.Linux; return ModOS.Linux;
@ -143,8 +142,8 @@ public abstract class RawMods : ModsBase
default: throw new NotSupportedException("The OS of the mod zip is unknown and thus not supported."); default: throw new NotSupportedException("The OS of the mod zip is unknown and thus not supported.");
} }
// TODO: is missing the d3dx9_dll
File.Copy(UtilDir + "/executable.exe", extractDirectory + "/AM2R.exe"); File.Copy(UtilDir + "/executable.exe", extractDirectory + "/AM2R.exe");
File.Copy(UtilDir + "/D3DX9_43.dll", extractDirectory + "/D3DX9_43.dll");
//zip the result //zip the result
outputDelegate.SendOutput("Creating raw Windows zip..."); outputDelegate.SendOutput("Creating raw Windows zip...");

@ -176,11 +176,12 @@ public class RawModsTests : IDisposable
} }
case Core.ModOS.Linux: case Core.ModOS.Linux:
{ {
// File contents should be same between the zips except for runner missing in original and data file being different // File contents should be same between the zips except for runner+d3d.dll missing in original and data file being different
var origFiles = new DirectoryInfo(origExtract + "/assets").GetFiles().Select(f => f.Name).ToList(); var origFiles = new DirectoryInfo(origExtract + "/assets").GetFiles().Select(f => f.Name).ToList();
origFiles.Remove("game.unx"); origFiles.Remove("game.unx");
origFiles.Add("data.win"); origFiles.Add("data.win");
origFiles.Add("AM2R.exe"); origFiles.Add("AM2R.exe");
origFiles.Add("D3DX9_43.dll");
origFiles.Sort(); origFiles.Sort();
var newFiles = new DirectoryInfo(newExtract).GetFiles().Select(f => f.Name).ToList(); var newFiles = new DirectoryInfo(newExtract).GetFiles().Select(f => f.Name).ToList();
newFiles.Sort(); newFiles.Sort();
@ -189,11 +190,12 @@ public class RawModsTests : IDisposable
} }
case Core.ModOS.Mac: case Core.ModOS.Mac:
{ {
// File contents should be the same between the zips except for runner missing in original, data file being different and extra mac files // File contents should be the same between the zips except for runner+d3d.dll missing in original, data file being different and extra mac files
var origFiles = new DirectoryInfo(origExtract + "/AM2R.app/Contents/Resources").GetFiles().Select(f => f.Name).ToList(); var origFiles = new DirectoryInfo(origExtract + "/AM2R.app/Contents/Resources").GetFiles().Select(f => f.Name).ToList();
origFiles.Remove("game.ios"); origFiles.Remove("game.ios");
origFiles.Add("data.win"); origFiles.Add("data.win");
origFiles.Add("AM2R.exe"); origFiles.Add("AM2R.exe");
origFiles.Add("D3DX9_43.dll");
origFiles.Remove("gamecontrollerdb.txt"); origFiles.Remove("gamecontrollerdb.txt");
origFiles.Remove("yoyorunner.config"); origFiles.Remove("yoyorunner.config");
origFiles.Sort(); origFiles.Sort();

Loading…
Cancel
Save