diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj index 9fea56db..00b3120f 100644 --- a/BinaryObjectScanner/BinaryObjectScanner.csproj +++ b/BinaryObjectScanner/BinaryObjectScanner.csproj @@ -26,10 +26,13 @@ MIT - + $(DefineConstants);WINX86 + + $(DefineConstants);WINX64 + @@ -56,9 +59,6 @@ - Content - Always - Always %(Identity) true diff --git a/BinaryObjectScanner/FileType/MPQ.cs b/BinaryObjectScanner/FileType/MPQ.cs index 11cb78d7..35a8ccbd 100644 --- a/BinaryObjectScanner/FileType/MPQ.cs +++ b/BinaryObjectScanner/FileType/MPQ.cs @@ -1,6 +1,6 @@ using System.IO; using BinaryObjectScanner.Interfaces; -#if (NET452_OR_GREATER || NETCOREAPP) && WINX86 +#if (NET452_OR_GREATER || NETCOREAPP) && (WINX86 || WINX64) using StormLibSharp; #endif diff --git a/BinaryObjectScanner/runtimes/win-x64/CascLib.dll b/BinaryObjectScanner/runtimes/win-x64/CascLib.dll new file mode 100644 index 00000000..cc5b7a4f Binary files /dev/null and b/BinaryObjectScanner/runtimes/win-x64/CascLib.dll differ diff --git a/BinaryObjectScanner/runtimes/win-x64/StormLib.dll b/BinaryObjectScanner/runtimes/win-x64/StormLib.dll new file mode 100644 index 00000000..afbe72a5 Binary files /dev/null and b/BinaryObjectScanner/runtimes/win-x64/StormLib.dll differ diff --git a/BinaryObjectScanner/runtimes/win-x86/CascLib.dll b/BinaryObjectScanner/runtimes/win-x86/CascLib.dll index f784d0e7..e4b4ff14 100644 Binary files a/BinaryObjectScanner/runtimes/win-x86/CascLib.dll and b/BinaryObjectScanner/runtimes/win-x86/CascLib.dll differ diff --git a/BinaryObjectScanner/runtimes/win-x86/StormLib.dll b/BinaryObjectScanner/runtimes/win-x86/StormLib.dll index 63719063..ff0700b9 100644 Binary files a/BinaryObjectScanner/runtimes/win-x86/StormLib.dll and b/BinaryObjectScanner/runtimes/win-x86/StormLib.dll differ diff --git a/ExtractionTool/ExtractionTool.csproj b/ExtractionTool/ExtractionTool.csproj index 3c383dcf..ba7f310b 100644 --- a/ExtractionTool/ExtractionTool.csproj +++ b/ExtractionTool/ExtractionTool.csproj @@ -30,6 +30,40 @@ $(DefineConstants);WINX86 + + $(DefineConstants);WINX64 + + + + + + Always + Always + CascLib.dll + + + Always + Always + mspack.dll + + + Always + Always + StormLib.dll + + + + + Always + Always + CascLib.dll + + + Always + Always + StormLib.dll + + diff --git a/ExtractionTool/Program.cs b/ExtractionTool/Program.cs index 51094dfa..eabc5a7b 100644 --- a/ExtractionTool/Program.cs +++ b/ExtractionTool/Program.cs @@ -317,7 +317,7 @@ namespace ExtractionTool Console.WriteLine("Extracting MoPaQ contents"); Console.WriteLine(); -#if NET20 || NET35 || !WINX86 +#if NET20 || NET35 || !(WINX86 || WINX64) Console.WriteLine("Extraction is not supported for this framework!"); Console.WriteLine(); #else diff --git a/ProtectionScan/ProtectionScan.csproj b/ProtectionScan/ProtectionScan.csproj index 9079b6f2..3d04941e 100644 --- a/ProtectionScan/ProtectionScan.csproj +++ b/ProtectionScan/ProtectionScan.csproj @@ -26,10 +26,36 @@ net6.0;net7.0;net8.0;net9.0 - - - $(DefineConstants);WINX86 - + + + + Always + Always + CascLib.dll + + + Always + Always + mspack.dll + + + Always + Always + StormLib.dll + + + + + Always + Always + CascLib.dll + + + Always + Always + StormLib.dll + +