diff --git a/README.md b/README.md index c9e8c20..5869c5e 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,13 @@ System Requirements The SlunkCrypt library and the command-line application currently run on the following platforms: -* **Microsoft Windows** (Windows XP SP-3, or later) — 32-Bit (i686) and 64-Bit (x86-64) -* **Linux** (kernel version 3.17, or later) — 32-Bit (i686) and 64-Bit (x86-64) -* **Various BSD flavors** (tested on NetBSD 9.2, FreeBSD 13.0 and OpenBSD 7.0) — 32-Bit (i686) and 64-Bit (x86-64) -* **Solaris** (tested on Solaris 11.4 and OmniOS/illumos) — 32-Bit (i686) and 64-Bit (x86-64) -* **GNU/Hurd** (tested on Debian GNU/Hurd 0.9) — 32-Bit (i686) -* **Haiku** (tested on Haiku R1/b3) — 32-Bit (i686) and 64-Bit (x86-64) -* **Mac OS X** (tested on “Big Sur”) — Intel-based (x86-64) and Apple Silicon (AArch64) +* **Microsoft Windows** (Windows XP SP-3, or later) — i686, x86-64 and ARM64 +* **Linux** (kernel version 3.17, or later) — i686, x86-64, ARM64 and MIPS +* **Various BSD flavors** (tested on NetBSD 9.2, FreeBSD 13.0 and OpenBSD 7.0) — i686 and x86-64 +* **Solaris** (tested on Solaris 11.4 and OmniOS/illumos) — i686 and x86-64 +* **GNU/Hurd** (tested on Debian GNU/Hurd 0.9) — i686 +* **Haiku** (tested on Haiku R1/b3) — i686 and x86-64 +* **Mac OS X** (tested on “Big Sur”) — x86-64 and ARM64 The SlunkCrypt GUI application currently runs on the following platforms: diff --git a/Slunk.sln b/Slunk.sln index 2bac0ad..752c074 100644 --- a/Slunk.sln +++ b/Slunk.sln @@ -15,60 +15,86 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlunkCryptGUI", "gui\SlunkC EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release_DLL|ARM64 = Release_DLL|ARM64 Release_DLL|x64 = Release_DLL|x64 Release_DLL|x86 = Release_DLL|x86 + Release_SSE2|ARM64 = Release_SSE2|ARM64 Release_SSE2|x64 = Release_SSE2|x64 Release_SSE2|x86 = Release_SSE2|x86 + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {86D28793-713E-4CEC-9686-335514AC5EF0}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {86D28793-713E-4CEC-9686-335514AC5EF0}.Debug|ARM64.Build.0 = Debug|ARM64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Debug|x64.ActiveCfg = Debug|x64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Debug|x64.Build.0 = Debug|x64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Debug|x86.ActiveCfg = Debug|Win32 {86D28793-713E-4CEC-9686-335514AC5EF0}.Debug|x86.Build.0 = Debug|Win32 + {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_DLL|ARM64.ActiveCfg = Release_DLL|ARM64 + {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_DLL|ARM64.Build.0 = Release_DLL|ARM64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_DLL|x64.ActiveCfg = Release_DLL|x64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_DLL|x64.Build.0 = Release_DLL|x64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_DLL|x86.ActiveCfg = Release_DLL|Win32 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_DLL|x86.Build.0 = Release_DLL|Win32 + {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_SSE2|ARM64.ActiveCfg = Release_SSE2|ARM64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_SSE2|x64.ActiveCfg = Release_SSE2|x64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_SSE2|x64.Build.0 = Release_SSE2|x64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_SSE2|x86.ActiveCfg = Release_SSE2|Win32 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_SSE2|x86.Build.0 = Release_SSE2|Win32 + {86D28793-713E-4CEC-9686-335514AC5EF0}.Release|ARM64.ActiveCfg = Release|ARM64 + {86D28793-713E-4CEC-9686-335514AC5EF0}.Release|ARM64.Build.0 = Release|ARM64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release|x64.ActiveCfg = Release|x64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release|x64.Build.0 = Release|x64 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release|x86.ActiveCfg = Release|Win32 {86D28793-713E-4CEC-9686-335514AC5EF0}.Release|x86.Build.0 = Release|Win32 + {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Debug|ARM64.Build.0 = Debug|ARM64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Debug|x64.ActiveCfg = Debug|x64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Debug|x64.Build.0 = Debug|x64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Debug|x86.ActiveCfg = Debug|Win32 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Debug|x86.Build.0 = Debug|Win32 + {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_DLL|ARM64.ActiveCfg = Release_DLL|ARM64 + {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_DLL|ARM64.Build.0 = Release_DLL|ARM64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_DLL|x64.ActiveCfg = Release_DLL|x64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_DLL|x64.Build.0 = Release_DLL|x64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_DLL|x86.ActiveCfg = Release_DLL|Win32 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_DLL|x86.Build.0 = Release_DLL|Win32 + {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_SSE2|ARM64.ActiveCfg = Release_SSE2|ARM64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_SSE2|x64.ActiveCfg = Release_SSE2|x64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_SSE2|x64.Build.0 = Release_SSE2|x64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_SSE2|x86.ActiveCfg = Release_SSE2|Win32 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_SSE2|x86.Build.0 = Release_SSE2|Win32 + {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release|ARM64.ActiveCfg = Release|ARM64 + {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release|ARM64.Build.0 = Release|ARM64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release|x64.ActiveCfg = Release|x64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release|x64.Build.0 = Release|x64 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release|x86.ActiveCfg = Release|Win32 {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release|x86.Build.0 = Release|Win32 + {568F3936-B520-4371-981C-E7A4DA781737}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {568F3936-B520-4371-981C-E7A4DA781737}.Debug|ARM64.Build.0 = Debug|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Debug|x64.ActiveCfg = Debug|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Debug|x64.Build.0 = Debug|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Debug|x86.ActiveCfg = Debug|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Debug|x86.Build.0 = Debug|Any CPU + {568F3936-B520-4371-981C-E7A4DA781737}.Release_DLL|ARM64.ActiveCfg = Release|Any CPU + {568F3936-B520-4371-981C-E7A4DA781737}.Release_DLL|ARM64.Build.0 = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release_DLL|x64.ActiveCfg = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release_DLL|x64.Build.0 = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release_DLL|x86.ActiveCfg = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release_DLL|x86.Build.0 = Release|Any CPU + {568F3936-B520-4371-981C-E7A4DA781737}.Release_SSE2|ARM64.ActiveCfg = Release|Any CPU + {568F3936-B520-4371-981C-E7A4DA781737}.Release_SSE2|ARM64.Build.0 = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release_SSE2|x64.ActiveCfg = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release_SSE2|x64.Build.0 = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release_SSE2|x86.ActiveCfg = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release_SSE2|x86.Build.0 = Release|Any CPU + {568F3936-B520-4371-981C-E7A4DA781737}.Release|ARM64.ActiveCfg = Release|Any CPU + {568F3936-B520-4371-981C-E7A4DA781737}.Release|ARM64.Build.0 = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release|x64.ActiveCfg = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release|x64.Build.0 = Release|Any CPU {568F3936-B520-4371-981C-E7A4DA781737}.Release|x86.ActiveCfg = Release|Any CPU diff --git a/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3-arm64.dll b/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3-arm64.dll new file mode 100644 index 0000000..edd9660 Binary files /dev/null and b/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3-arm64.dll differ diff --git a/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3-arm64.pdb b/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3-arm64.pdb new file mode 100644 index 0000000..c29149d Binary files /dev/null and b/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3-arm64.pdb differ diff --git a/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3d-arm64.dll b/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3d-arm64.dll new file mode 100644 index 0000000..8de41e5 Binary files /dev/null and b/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3d-arm64.dll differ diff --git a/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3d-arm64.pdb b/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3d-arm64.pdb new file mode 100644 index 0000000..6e04ae8 Binary files /dev/null and b/etc/deps/pthreads4w/bin/msvc-v141/pthreadVC3d-arm64.pdb differ diff --git a/etc/deps/pthreads4w/lib/msvc-v141/shared/arm64/pthreadVC3.lib b/etc/deps/pthreads4w/lib/msvc-v141/shared/arm64/pthreadVC3.lib new file mode 100644 index 0000000..e4ffa1a Binary files /dev/null and b/etc/deps/pthreads4w/lib/msvc-v141/shared/arm64/pthreadVC3.lib differ diff --git a/etc/deps/pthreads4w/lib/msvc-v141/shared/arm64/pthreadVC3d.lib b/etc/deps/pthreads4w/lib/msvc-v141/shared/arm64/pthreadVC3d.lib new file mode 100644 index 0000000..57cb931 Binary files /dev/null and b/etc/deps/pthreads4w/lib/msvc-v141/shared/arm64/pthreadVC3d.lib differ diff --git a/etc/deps/pthreads4w/lib/msvc-v141/static/arm64/libpthreadVC3.lib b/etc/deps/pthreads4w/lib/msvc-v141/static/arm64/libpthreadVC3.lib new file mode 100644 index 0000000..6869d59 Binary files /dev/null and b/etc/deps/pthreads4w/lib/msvc-v141/static/arm64/libpthreadVC3.lib differ diff --git a/etc/deps/pthreads4w/lib/msvc-v141/static/arm64/libpthreadVC3d.lib b/etc/deps/pthreads4w/lib/msvc-v141/static/arm64/libpthreadVC3d.lib new file mode 100644 index 0000000..9eb3c0d Binary files /dev/null and b/etc/deps/pthreads4w/lib/msvc-v141/static/arm64/libpthreadVC3d.lib differ diff --git a/frontend/SlunkCrypt.vcxproj b/frontend/SlunkCrypt.vcxproj index 8c33d19..a8377b4 100644 --- a/frontend/SlunkCrypt.vcxproj +++ b/frontend/SlunkCrypt.vcxproj @@ -1,10 +1,22 @@  + + Debug + ARM64 + Debug Win32 + + Release_DLL + ARM64 + + + Release_SSE2 + ARM64 + Release_SSE2 Win32 @@ -21,6 +33,10 @@ Release_DLL x64 + + Release + ARM64 + Release Win32 @@ -71,6 +87,9 @@ 10.0.14393.0 + + x64 + Application true @@ -104,6 +123,12 @@ v141 Unicode + + Application + true + v142 + Unicode + Application false @@ -111,6 +136,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application false @@ -118,6 +150,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application false @@ -125,6 +164,13 @@ true Unicode + + Application + false + v142 + true + Unicode + @@ -150,18 +196,34 @@ + + + + + + + + + + + + + + + + true @@ -193,24 +255,48 @@ $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ slunkcrypt-cli-x64 + + slunkcrypt-cli-arm64 + true + $(SolutionDir)bin\debug\ + $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + false $(SolutionDir)bin\static\ $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ slunkcrypt-cli-x64 + + slunkcrypt-cli-arm64 + false + $(SolutionDir)bin\static\ + $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + false $(SolutionDir)bin\static\ $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ slunkcrypt-cli-avx2 + + slunkcrypt-cli-arm64 + false + $(SolutionDir)bin\static\ + $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + false $(SolutionDir)bin\shared\ $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ slunkcrypt-cli-x64 + + slunkcrypt-cli-arm64 + false + $(SolutionDir)bin\shared\ + $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + Level4 @@ -340,6 +426,25 @@ libpthreadVC3d.lib;%(AdditionalDependencies) + + + Level4 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(SolutionDir)libSlunkCrypt\include + 4706;4204 + MultiThreadedDebug + NotSet + + + Console + true + 6.2 + $(ProjectDir)..\etc\deps\pthreads4w\lib\msvc-v141\static\arm64;%(AdditionalLibraryDirectories) + libpthreadVC3d.lib;%(AdditionalDependencies) + + Level4 @@ -371,6 +476,37 @@ libpthreadVC3.lib;%(AdditionalDependencies) + + + Level4 + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(SolutionDir)libSlunkCrypt\include + MaxSpeed + AnySuitable + Speed + true + true + MultiThreaded + false + Fast + 4706;4204 + false + NotSet + + + Console + true + true + false + UseLinkTimeCodeGeneration + 6.2 + $(ProjectDir)..\etc\deps\pthreads4w\lib\msvc-v141\static\arm64;%(AdditionalLibraryDirectories) + libpthreadVC3.lib;%(AdditionalDependencies) + + Level4 @@ -402,6 +538,37 @@ libpthreadVC3.lib;%(AdditionalDependencies) + + + Level4 + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(SolutionDir)libSlunkCrypt\include + MaxSpeed + AnySuitable + Speed + true + true + MultiThreaded + false + Fast + 4706;4204 + false + NotSet + + + Console + true + true + false + UseLinkTimeCodeGeneration + 6.2 + $(ProjectDir)..\etc\deps\pthreads4w\lib\msvc-v141\static\arm64;%(AdditionalLibraryDirectories) + libpthreadVC3.lib;%(AdditionalDependencies) + + Level4 @@ -431,6 +598,35 @@ 5.2 + + + Level4 + true + true + NDEBUG;_CONSOLE;SLUNKCRYPT_SHARED=1;%(PreprocessorDefinitions) + true + $(SolutionDir)libSlunkCrypt\include + MaxSpeed + AnySuitable + Speed + true + true + MultiThreadedDLL + false + Fast + 4706;4204 + false + NotSet + + + true + true + false + UseLinkTimeCodeGeneration + Console + 6.2 + + diff --git a/libslunkcrypt/libSlunkCrypt.vcxproj b/libslunkcrypt/libSlunkCrypt.vcxproj index 01746df..aca8019 100644 --- a/libslunkcrypt/libSlunkCrypt.vcxproj +++ b/libslunkcrypt/libSlunkCrypt.vcxproj @@ -1,10 +1,22 @@ + + Debug + ARM64 + Debug Win32 + + Release_DLL + ARM64 + + + Release_SSE2 + ARM64 + Release_SSE2 Win32 @@ -21,6 +33,10 @@ Release_DLL x64 + + Release + ARM64 + Release Win32 @@ -56,6 +72,9 @@ 10.0.14393.0 + + x64 + StaticLibrary true @@ -89,6 +108,12 @@ v141 Unicode + + StaticLibrary + true + v142 + Unicode + StaticLibrary false @@ -96,6 +121,13 @@ true Unicode + + StaticLibrary + false + v142 + true + Unicode + StaticLibrary false @@ -103,6 +135,13 @@ true Unicode + + StaticLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -110,6 +149,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + @@ -135,18 +181,34 @@ + + + + + + + + + + + + + + + + true @@ -178,24 +240,48 @@ $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ libslunkcrypt-1-x64 + + libslunkcrypt-1-arm64 + true + $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + $(SolutionDir)bin\debug\ + false $(SolutionDir)bin\static\ $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ libslunkcrypt-1-x64 + + libslunkcrypt-1-arm64 + false + $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + $(SolutionDir)bin\static\ + false $(SolutionDir)bin\static\ $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ libslunkcrypt-1-avx2 + + libslunkcrypt-1-arm64 + false + $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + $(SolutionDir)bin\static\ + false $(SolutionDir)bin\shared\ $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ libslunkcrypt-1-x64 + + libslunkcrypt-1-arm64 + false + $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + $(SolutionDir)bin\shared\ + Level4 @@ -307,6 +393,7 @@ Console $(ProjectDir)..\etc\deps\pthreads4w\lib\msvc-v141\shared\i686;%(AdditionalLibraryDirectories) pthreadVC3.lib;%(AdditionalDependencies) + 5.1 copy /Y /B "$(ProjectDir)..\etc\deps\pthreads4w\bin\msvc-v141\pthreadVC3-i686.dll" "$(TargetDir)" @@ -331,6 +418,24 @@ true + + + Level4 + true + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + $(ProjectDir)include;$(ProjectDir)..\etc\deps\pthreads4w\include;%(AdditionalIncludeDirectories) + 4706;4204 + MultiThreadedDebug + NotSet + + + + + true + + Level4 @@ -363,6 +468,38 @@ true + + + Level4 + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + $(ProjectDir)include;$(ProjectDir)..\etc\deps\pthreads4w\include;%(AdditionalIncludeDirectories) + MaxSpeed + AnySuitable + Speed + true + true + MultiThreaded + false + Fast + 4706;4204 + false + NotSet + + + + + true + true + true + + + true + + Level4 @@ -395,6 +532,38 @@ true + + + Level4 + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + $(ProjectDir)include;$(ProjectDir)..\etc\deps\pthreads4w\include;%(AdditionalIncludeDirectories) + MaxSpeed + AnySuitable + Speed + true + true + MultiThreaded + false + Fast + 4706;4204 + false + NotSet + + + + + true + true + true + + + true + + Level4 @@ -424,6 +593,45 @@ Console $(ProjectDir)..\etc\deps\pthreads4w\lib\msvc-v141\shared\x64;%(AdditionalLibraryDirectories) pthreadVC3.lib;%(AdditionalDependencies) + 5.2 + + + copy /Y /B "$(ProjectDir)..\etc\deps\pthreads4w\bin\msvc-v141\pthreadVC3-x64.dll" "$(TargetDir)" + + + Copy DLL dependencies... + + + + + Level4 + true + true + NDEBUG;_DLL;SLUNKCRYPT_SHARED=1;SLUNKCRYPT_EXPORT=1;%(PreprocessorDefinitions) + true + NotUsing + $(ProjectDir)include;$(ProjectDir)..\etc\deps\pthreads4w\include;%(AdditionalIncludeDirectories) + MaxSpeed + AnySuitable + Speed + true + true + MultiThreadedDLL + false + Fast + 4706;4204 + false + NotSet + + + true + true + false + UseLinkTimeCodeGeneration + Console + $(ProjectDir)..\etc\deps\pthreads4w\lib\msvc-v141\shared\arm64;%(AdditionalLibraryDirectories) + pthreadVC3.lib;%(AdditionalDependencies) + 6.2 copy /Y /B "$(ProjectDir)..\etc\deps\pthreads4w\bin\msvc-v141\pthreadVC3-x64.dll" "$(TargetDir)" diff --git a/mk-release.cmd b/mk-release.cmd index 019cecc..4278912 100644 --- a/mk-release.cmd +++ b/mk-release.cmd @@ -12,19 +12,21 @@ if not exist "%MSVC_PATH%\Auxiliary\Build\vcvarsall.bat" ( goto:eof ) -for %%p in (x86,x64) do ( +for %%p in (x86,x64,ARM64) do ( call "%MSVC_PATH%\Auxiliary\Build\vcvarsall.bat" %%p - for %%c in (Release,Release_SSE2) do ( - %ECHO% white "\n------------------------------------------------------------------------------" - %ECHO% white "Clean [%%p:%%c]" - %ECHO% white "------------------------------------------------------------------------------\n" - MSBuild.exe /property:Configuration=%%c /property:Platform=%%p /target:Clean /verbosity:normal "%~dp0\Slunk.sln" - if not "!ERRORLEVEL!"=="0" goto:BuildFailed - %ECHO% white "\n------------------------------------------------------------------------------" - %ECHO% white "Compile [%%p:%%c]" - %ECHO% white "------------------------------------------------------------------------------\n" - MSBuild.exe /property:Configuration=%%c /property:Platform=%%p /target:Build /verbosity:normal "%~dp0\Slunk.sln" - if not "!ERRORLEVEL!"=="0" goto:BuildFailed + for %%c in (Release,Release_SSE2,Release_DLL,Debug) do ( + if not "%%p::%%c"=="ARM64::Release_SSE2" ( + %ECHO% white "\n------------------------------------------------------------------------------" + %ECHO% white "Clean [%%p:%%c]" + %ECHO% white "------------------------------------------------------------------------------\n" + MSBuild.exe /property:Configuration=%%c /property:Platform=%%p /target:Clean /verbosity:normal "%~dp0\Slunk.sln" + if not "!ERRORLEVEL!"=="0" goto:BuildFailed + %ECHO% white "\n------------------------------------------------------------------------------" + %ECHO% white "Compile [%%p:%%c]" + %ECHO% white "------------------------------------------------------------------------------\n" + MSBuild.exe /property:Configuration=%%c /property:Platform=%%p /target:Build /verbosity:normal "%~dp0\Slunk.sln" + if not "!ERRORLEVEL!"=="0" goto:BuildFailed + ) ) )