Skip to content

Commit cde1a89

Browse files
mnadareskimnadareski
committed
Fix build script again, add MPQ to win-x64
1 parent 33c9da7 commit cde1a89

File tree

9 files changed

+70
-10
lines changed

9 files changed

+70
-10
lines changed

‎BinaryObjectScanner/BinaryObjectScanner.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@
2626
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2727
</PropertyGroup>
2828

29-
<!-- Set a build flag for Windows specifically -->
29+
<!-- Set build flags for Windows specifically -->
3030
<PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
3131
<DefineConstants>$(DefineConstants);WINX86</DefineConstants>
3232
</PropertyGroup>
33+
<PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x64'">
34+
<DefineConstants>$(DefineConstants);WINX64</DefineConstants>
35+
</PropertyGroup>
3336

3437
<!-- Exclude certain parts of external modules for by default -->
3538
<PropertyGroup>
@@ -56,9 +59,6 @@
5659
<!-- These are needed for dealing with native Windows DLLs -->
5760
<ItemGroup>
5861
<Content Include="runtimes\**\*">
59-
<BuildAction>Content</BuildAction>
60-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
61-
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
6262
<PackagePath>%(Identity)</PackagePath>
6363
<Pack>true</Pack>
6464
</Content>

‎BinaryObjectScanner/FileType/MPQ.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.IO;
22
using BinaryObjectScanner.Interfaces;
3-
#if (NET452_OR_GREATER || NETCOREAPP) && WINX86
3+
#if (NET452_OR_GREATER || NETCOREAPP) && (WINX86 || WINX64)
44
using StormLibSharp;
55
#endif
66

‎BinaryObjectScanner/runtimes/win-x64/CascLib.dll‎

224 KB
Binary file not shown.

‎BinaryObjectScanner/runtimes/win-x64/StormLib.dll‎

472 KB
Binary file not shown.

‎BinaryObjectScanner/runtimes/win-x86/CascLib.dll‎

-865 KB
Binary file not shown.

‎BinaryObjectScanner/runtimes/win-x86/StormLib.dll‎

-825 KB
Binary file not shown.

‎ExtractionTool/ExtractionTool.csproj‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,40 @@
3030
<PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
3131
<DefineConstants>$(DefineConstants);WINX86</DefineConstants>
3232
</PropertyGroup>
33+
<PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x64'">
34+
<DefineConstants>$(DefineConstants);WINX64</DefineConstants>
35+
</PropertyGroup>
36+
37+
<!-- These are needed for dealing with native Windows DLLs -->
38+
<ItemGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
39+
<ContentWithTargetPath Include="..\BinaryObjectScanner\runtimes\win-x86\CascLib.dll">
40+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
41+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
42+
<TargetPath>CascLib.dll</TargetPath>
43+
</ContentWithTargetPath>
44+
<ContentWithTargetPath Include="..\BinaryObjectScanner\runtimes\win-x86\mspack.dll">
45+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
46+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
47+
<TargetPath>mspack.dll</TargetPath>
48+
</ContentWithTargetPath>
49+
<ContentWithTargetPath Include="..\BinaryObjectScanner\runtimes\win-x86\StormLib.dll">
50+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
51+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
52+
<TargetPath>StormLib.dll</TargetPath>
53+
</ContentWithTargetPath>
54+
</ItemGroup>
55+
<ItemGroup Condition="'$(RuntimeIdentifier)'=='win-x64'">
56+
<ContentWithTargetPath Include="..\BinaryObjectScanner\runtimes\win-x64\CascLib.dll">
57+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
58+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
59+
<TargetPath>CascLib.dll</TargetPath>
60+
</ContentWithTargetPath>
61+
<ContentWithTargetPath Include="..\BinaryObjectScanner\runtimes\win-x64\StormLib.dll">
62+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
63+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
64+
<TargetPath>StormLib.dll</TargetPath>
65+
</ContentWithTargetPath>
66+
</ItemGroup>
3367

3468
<ItemGroup>
3569
<ProjectReference Include="..\BinaryObjectScanner\BinaryObjectScanner.csproj" />

‎ExtractionTool/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ private static void ExtractFile(string file, string outputDirectory, bool includ
317317
Console.WriteLine("Extracting MoPaQ contents");
318318
Console.WriteLine();
319319

320-
#if NET20 || NET35 || !WINX86
320+
#if NET20 || NET35 || !(WINX86 || WINX64)
321321
Console.WriteLine("Extraction is not supported for this framework!");
322322
Console.WriteLine();
323323
#else

‎ProtectionScan/ProtectionScan.csproj‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,36 @@
2626
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
2727
</PropertyGroup>
2828

29-
<!-- Set a build flag for Windows specifically -->
30-
<PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
31-
<DefineConstants>$(DefineConstants);WINX86</DefineConstants>
32-
</PropertyGroup>
29+
<!-- These are needed for dealing with native Windows DLLs -->
30+
<ItemGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
31+
<ContentWithTargetPath Include="..\BinaryObjectScanner\runtimes\win-x86\CascLib.dll">
32+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
33+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
34+
<TargetPath>CascLib.dll</TargetPath>
35+
</ContentWithTargetPath>
36+
<ContentWithTargetPath Include="..\BinaryObjectScanner\runtimes\win-x86\mspack.dll">
37+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
38+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
39+
<TargetPath>mspack.dll</TargetPath>
40+
</ContentWithTargetPath>
41+
<ContentWithTargetPath Include="..\BinaryObjectScanner\runtimes\win-x86\StormLib.dll">
42+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
43+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
44+
<TargetPath>StormLib.dll</TargetPath>
45+
</ContentWithTargetPath>
46+
</ItemGroup>
47+
<ItemGroup Condition="'$(RuntimeIdentifier)'=='win-x64'">
48+
<ContentWithTargetPath Include="..\BinaryObjectScanner\runtimes\win-x64\CascLib.dll">
49+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
50+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
51+
<TargetPath>CascLib.dll</TargetPath>
52+
</ContentWithTargetPath>
53+
<ContentWithTargetPath Include="..\BinaryObjectScanner\runtimes\win-x64\StormLib.dll">
54+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
55+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
56+
<TargetPath>StormLib.dll</TargetPath>
57+
</ContentWithTargetPath>
58+
</ItemGroup>
3359

3460
<ItemGroup>
3561
<ProjectReference Include="..\BinaryObjectScanner\BinaryObjectScanner.csproj" />

0 commit comments

Comments
 (0)