diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 921f09e..d66a2d4 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -41,4 +41,9 @@ jobs: working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference - run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} + run: | + Invoke-WebRequest -Uri https://github.com/ANSSI-FR/MLA/releases/download/mla-1.3.0/libmla-windows-i686-1.3.0.zip -OutFile libmla-windows-i686.zip + Invoke-WebRequest -Uri https://github.com/ANSSI-FR/MLA/releases/download/mla-1.3.0/libmla-windows-x86_64-1.3.0.zip -OutFile libmla-windows-x86_64.zip + Expand-Archive -Path libmla-windows-i686.zip -DestinationPath .\mla\libmla-windows-i686 + Expand-Archive -Path libmla-windows-x86_64.zip -DestinationPath .\mla\libmla-windows-x86_64 + msbuild /m /p:Platform=x64 /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} diff --git a/MLA.cpp b/MLA.cpp index 15e651d..e8a2e02 100644 --- a/MLA.cpp +++ b/MLA.cpp @@ -16,6 +16,7 @@ #define MLA_RELEASE "" #endif #pragma comment(lib, "mla\\libmla-windows-" MLA_ARCH MLA_RELEASE "\\mla.lib") +#pragma comment(lib, "bcrypt.lib") // Compression level 5 found to be most efficient for ORADAD's CSV files and execution time constraints //const uint32_t ulGlobalCompressionLevel = 5; diff --git a/ORADAD.sln b/ORADAD.sln index 66b81aa..6718348 100644 --- a/ORADAD.sln +++ b/ORADAD.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28803.156 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ORADAD", "ORADAD.vcxproj", "{81A611C5-6450-4A60-B6FD-8B4031B44E6E}" EndProject @@ -13,8 +13,8 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {81A611C5-6450-4A60-B6FD-8B4031B44E6E}.Debug|x64.ActiveCfg = Debug|x64 - {81A611C5-6450-4A60-B6FD-8B4031B44E6E}.Debug|x64.Build.0 = Debug|x64 + {81A611C5-6450-4A60-B6FD-8B4031B44E6E}.Debug|x64.ActiveCfg = Release|x64 + {81A611C5-6450-4A60-B6FD-8B4031B44E6E}.Debug|x64.Build.0 = Release|x64 {81A611C5-6450-4A60-B6FD-8B4031B44E6E}.Debug|x86.ActiveCfg = Debug|Win32 {81A611C5-6450-4A60-B6FD-8B4031B44E6E}.Debug|x86.Build.0 = Debug|Win32 {81A611C5-6450-4A60-B6FD-8B4031B44E6E}.Release|x64.ActiveCfg = Release|x64