diff --git a/AM2RPortHelperLib/RawMods.cs b/AM2RPortHelperLib/RawMods.cs index ea8b80a..ca08160 100644 --- a/AM2RPortHelperLib/RawMods.cs +++ b/AM2RPortHelperLib/RawMods.cs @@ -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")) 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")) 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."); } - // TODO: is missing the d3dx9_dll File.Copy(UtilDir + "/executable.exe", extractDirectory + "/AM2R.exe"); + File.Copy(UtilDir + "/D3DX9_43.dll", extractDirectory + "/D3DX9_43.dll"); //zip the result outputDelegate.SendOutput("Creating raw Windows zip..."); diff --git a/AM2RPortHelperLib/utils/D3DX9_43.dll b/AM2RPortHelperLib/utils/D3DX9_43.dll new file mode 100644 index 0000000..96cfbe2 Binary files /dev/null and b/AM2RPortHelperLib/utils/D3DX9_43.dll differ diff --git a/AM2RPortHelperTests/RawModsTests.cs b/AM2RPortHelperTests/RawModsTests.cs index d01a2a6..dd6f0f3 100644 --- a/AM2RPortHelperTests/RawModsTests.cs +++ b/AM2RPortHelperTests/RawModsTests.cs @@ -176,11 +176,12 @@ public class RawModsTests : IDisposable } 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(); origFiles.Remove("game.unx"); origFiles.Add("data.win"); origFiles.Add("AM2R.exe"); + origFiles.Add("D3DX9_43.dll"); origFiles.Sort(); var newFiles = new DirectoryInfo(newExtract).GetFiles().Select(f => f.Name).ToList(); newFiles.Sort(); @@ -189,11 +190,12 @@ public class RawModsTests : IDisposable } 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(); origFiles.Remove("game.ios"); origFiles.Add("data.win"); origFiles.Add("AM2R.exe"); + origFiles.Add("D3DX9_43.dll"); origFiles.Remove("gamecontrollerdb.txt"); origFiles.Remove("yoyorunner.config"); origFiles.Sort();