diff --git a/Slunk.sln b/Slunk.sln
index d5827bd..dfc6e18 100644
--- a/Slunk.sln
+++ b/Slunk.sln
@@ -21,8 +21,6 @@ Global
Release_DLL|x86 = Release_DLL|x86
Release_SSE2|x64 = Release_SSE2|x64
Release_SSE2|x86 = Release_SSE2|x86
- Release_WithDbgInfo|x64 = Release_WithDbgInfo|x64
- Release_WithDbgInfo|x86 = Release_WithDbgInfo|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
@@ -38,10 +36,6 @@ Global
{86D28793-713E-4CEC-9686-335514AC5EF0}.Release_SSE2|x64.ActiveCfg = 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_WithDbgInfo|x64.ActiveCfg = Release_WithDbgInfo|x64
- {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_WithDbgInfo|x64.Build.0 = Release_WithDbgInfo|x64
- {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_WithDbgInfo|x86.ActiveCfg = Release_WithDbgInfo|Win32
- {86D28793-713E-4CEC-9686-335514AC5EF0}.Release_WithDbgInfo|x86.Build.0 = Release_WithDbgInfo|Win32
{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
@@ -57,10 +51,6 @@ Global
{A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_SSE2|x64.ActiveCfg = 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_WithDbgInfo|x64.ActiveCfg = Release_WithDbgInfo|x64
- {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_WithDbgInfo|x64.Build.0 = Release_WithDbgInfo|x64
- {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_WithDbgInfo|x86.ActiveCfg = Release_WithDbgInfo|Win32
- {A4A3879C-BD2C-4304-AF66-7349CEF7E4C0}.Release_WithDbgInfo|x86.Build.0 = Release_WithDbgInfo|Win32
{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
@@ -77,10 +67,6 @@ Global
{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_WithDbgInfo|x64.ActiveCfg = Release|Any CPU
- {568F3936-B520-4371-981C-E7A4DA781737}.Release_WithDbgInfo|x64.Build.0 = Release|Any CPU
- {568F3936-B520-4371-981C-E7A4DA781737}.Release_WithDbgInfo|x86.ActiveCfg = Release|Any CPU
- {568F3936-B520-4371-981C-E7A4DA781737}.Release_WithDbgInfo|x86.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/cpu-capabilities/cpu-capabilities-x64.dll b/etc/deps/cpu-capabilities/cpu-capabilities-x64.dll
index d483af3..2c9fafd 100644
Binary files a/etc/deps/cpu-capabilities/cpu-capabilities-x64.dll and b/etc/deps/cpu-capabilities/cpu-capabilities-x64.dll differ
diff --git a/etc/deps/cpu-capabilities/cpu-capabilities-x86.dll b/etc/deps/cpu-capabilities/cpu-capabilities-x86.dll
index 7a47a83..59925f0 100644
Binary files a/etc/deps/cpu-capabilities/cpu-capabilities-x86.dll and b/etc/deps/cpu-capabilities/cpu-capabilities-x86.dll differ
diff --git a/frontend/SlunkCrypt.vcxproj b/frontend/SlunkCrypt.vcxproj
index 89b4589..6542792 100644
--- a/frontend/SlunkCrypt.vcxproj
+++ b/frontend/SlunkCrypt.vcxproj
@@ -21,14 +21,6 @@
Release_DLL
x64
-
- Release_WithDbgInfo
- Win32
-
-
- Release_WithDbgInfo
- x64
-
Release
Win32
@@ -99,13 +91,6 @@
true
Unicode
-
- Application
- false
- v141
- true
- Unicode
-
Application
false
@@ -133,13 +118,6 @@
true
Unicode
-
- Application
- false
- v141
- true
- Unicode
-
Application
false
@@ -164,10 +142,6 @@
-
-
-
-
@@ -184,10 +158,6 @@
-
-
-
-
@@ -195,63 +165,51 @@
true
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\debug\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- slunkcrypt-cli-$(PlatformShortName)
+ slunkcrypt-cli-i686
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\static\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- slunkcrypt-cli-$(PlatformShortName)
+ slunkcrypt-cli-i686
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\static\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- slunkcrypt-cli-$(PlatformShortName)-sse2
-
-
- false
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- slunkcrypt-cli-$(PlatformShortName)
+ slunkcrypt-cli-sse2
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\shared\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- slunkcrypt-cli-$(PlatformShortName)
+ slunkcrypt-cli-i686
true
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\debug\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- slunkcrypt-cli-$(PlatformShortName)
+ slunkcrypt-cli-x64
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\static\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- slunkcrypt-cli-$(PlatformShortName)
+ slunkcrypt-cli-x64
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\static\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- slunkcrypt-cli-$(PlatformShortName)-sse2
-
-
- false
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- slunkcrypt-cli-$(PlatformShortName)
+ slunkcrypt-cli-x64-sse2
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\shared\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- slunkcrypt-cli-$(PlatformShortName)
+ slunkcrypt-cli-x64
@@ -262,6 +220,7 @@
$(SolutionDir)libSlunkCrypt\include
4706;4204
MultiThreadedDebug
+ NoExtensions
Console
@@ -327,37 +286,6 @@
5.1
-
-
- Level4
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- true
- $(SolutionDir)libSlunkCrypt\include
- MaxSpeed
- Disabled
- Speed
- false
- true
- MultiThreaded
- false
- Fast
- NoExtensions
- 4706;4204
- false
- ProgramDatabase
- Sync
-
-
- Console
- true
- true
- true
- UseLinkTimeCodeGeneration
- 5.1
-
-
Level4
@@ -396,6 +324,7 @@
$(SolutionDir)libSlunkCrypt\include
4706;4204
MultiThreadedDebug
+ NotSet
Console
@@ -461,36 +390,6 @@
5.2
-
-
- Level4
- true
- true
- NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- true
- $(SolutionDir)libSlunkCrypt\include
- MaxSpeed
- Disabled
- Speed
- false
- true
- MultiThreaded
- false
- Fast
- 4706;4204
- false
- ProgramDatabase
- Sync
-
-
- Console
- true
- true
- true
- UseLinkTimeCodeGeneration
- 5.2
-
-
Level4
@@ -509,6 +408,7 @@
Fast
4706;4204
false
+ NotSet
true
diff --git a/gui/Process/SlunkCryptRunner.cs b/gui/Process/SlunkCryptRunner.cs
index 68294a6..6979a06 100644
--- a/gui/Process/SlunkCryptRunner.cs
+++ b/gui/Process/SlunkCryptRunner.cs
@@ -84,12 +84,12 @@ namespace com.muldersoft.slunkcrypt.gui.process
Trace.Assert(executableFile != null);
return executableFile;
}
- if (cpuFeatures.sse2 && CheckExecutableFile(ref executableFile, appBaseDirectory, "x86-sse2"))
+ if (cpuFeatures.sse2 && CheckExecutableFile(ref executableFile, appBaseDirectory, "sse2"))
{
Trace.Assert(executableFile != null);
return executableFile;
}
- if (CheckExecutableFile(ref executableFile, appBaseDirectory, "x86"))
+ if (CheckExecutableFile(ref executableFile, appBaseDirectory, "i686"))
{
Trace.Assert(executableFile != null);
return executableFile;
diff --git a/gui/SlunkCryptGUI.csproj b/gui/SlunkCryptGUI.csproj
index 9c7ae44..fd18c41 100644
--- a/gui/SlunkCryptGUI.csproj
+++ b/gui/SlunkCryptGUI.csproj
@@ -19,7 +19,7 @@
true
full
false
- $(SolutionDir)bin\Debug\
+ $(SolutionDir)bin\debug\
$(SolutionDir)obj\Debug\SlunkCryptGUI\
DEBUG;TRACE
prompt
@@ -31,7 +31,7 @@
AnyCPU
none
true
- $(SolutionDir)bin\Release\
+ $(SolutionDir)bin\static\
$(SolutionDir)obj\Release\SlunkCryptGUI\
TRACE
prompt
diff --git a/libslunkcrypt/libSlunkCrypt.vcxproj b/libslunkcrypt/libSlunkCrypt.vcxproj
index a02c7af..e700ce6 100644
--- a/libslunkcrypt/libSlunkCrypt.vcxproj
+++ b/libslunkcrypt/libSlunkCrypt.vcxproj
@@ -21,14 +21,6 @@
Release_DLL
x64
-
- Release_WithDbgInfo
- Win32
-
-
- Release_WithDbgInfo
- x64
-
Release
Win32
@@ -82,13 +74,6 @@
true
Unicode
-
- StaticLibrary
- false
- v141
- true
- Unicode
-
DynamicLibrary
false
@@ -116,13 +101,6 @@
true
Unicode
-
- StaticLibrary
- false
- v141
- true
- Unicode
-
DynamicLibrary
false
@@ -147,10 +125,6 @@
-
-
-
-
@@ -167,10 +141,6 @@
-
-
-
-
@@ -178,63 +148,51 @@
true
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\debug\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- libslunkcrypt-1-$(PlatformShortName)
+ libslunkcrypt-1-i686
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\static\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- libslunkcrypt-1-$(PlatformShortName)
+ libslunkcrypt-1-i686
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\static\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- libslunkcrypt-1-$(PlatformShortName)-sse2
-
-
- false
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- libslunkcrypt-1-$(PlatformShortName)
+ libslunkcrypt-1-sse2
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\shared\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- libslunkcrypt-1-$(PlatformShortName)
+ libslunkcrypt-1-i686
true
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\debug\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- libslunkcrypt-1-$(PlatformShortName)
+ libslunkcrypt-1-x64
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\static\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- libslunkcrypt-1-$(PlatformShortName)
+ libslunkcrypt-1-x64
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\static\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- libslunkcrypt-1-$(PlatformShortName)-sse2
-
-
- false
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- libslunkcrypt-1-$(PlatformShortName)
+ libslunkcrypt-1-x64-sse2
false
- $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)bin\shared\
$(SolutionDir)obj\$(Configuration)\$(PlatformShortName)\$(ProjectName)\
- libslunkcrypt-1-$(PlatformShortName)
+ libslunkcrypt-1-x64
@@ -246,6 +204,7 @@
$(ProjectDir)include
4706;4204
MultiThreadedDebug
+ NoExtensions
@@ -317,40 +276,6 @@
true
-
-
- Level4
- true
- true
- WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
- NotUsing
- $(ProjectDir)include
- MaxSpeed
- Disabled
- Speed
- false
- true
- MultiThreaded
- false
- Fast
- NoExtensions
- 4706;4204
- false
- ProgramDatabase
- Sync
-
-
-
-
- true
- true
- true
-
-
- true
-
-
Level4
@@ -390,6 +315,7 @@
$(ProjectDir)include
4706;4204
MultiThreadedDebug
+ NotSet
@@ -461,39 +387,6 @@
true
-
-
- Level4
- true
- true
- NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
- NotUsing
- $(ProjectDir)include
- MaxSpeed
- Disabled
- Speed
- false
- true
- MultiThreaded
- false
- Fast
- 4706;4204
- false
- ProgramDatabase
- Sync
-
-
-
-
- true
- true
- true
-
-
- true
-
-
Level4
@@ -513,6 +406,7 @@
Fast
4706;4204
false
+ NotSet
true
diff --git a/mk-profiled.cmd b/mk-profiled.cmd
index a48fc7b..28437d7 100644
--- a/mk-profiled.cmd
+++ b/mk-profiled.cmd
@@ -17,7 +17,7 @@ for %%p in (x86,x64) do (
for %%c in (Release,Release_SSE2) do (
if not "%%p::%%c" == "x64::Release_SSE2" (
set "TEMP_NAME=!RANDOM!-!RANDOM!"
- if "%%c"=="Release_SSE2" (set "SUFFIX=-sse2") else (set "SUFFIX=")
+ if "%%c"=="Release_SSE2" (set "SUFFIX=sse2") else (if "%%p"=="x86" (set "SUFFIX=i686") else (set "SUFFIX=%%p"))
%ECHO% white "\n------------------------------------------------------------------------------"
%ECHO% white "Clean [%%p:%%c]"
%ECHO% white "------------------------------------------------------------------------------\n"
@@ -33,9 +33,9 @@ for %%p in (x86,x64) do (
%ECHO% white "------------------------------------------------------------------------------\n"
"%~dp0.\etc\utils\win32\rand.exe" | "%~dp0.\etc\utils\win32\head.exe" -c 104857600 > "%TMP%\!TEMP_NAME!.dat"
if not "%ERRORLEVEL%"=="0" goto:BuildFailed
- "%~dp0.\bin\%%c\slunkcrypt-cli-%%p!SUFFIX!.exe" --encrypt pass:"KVeW9;z4$#]d9~}z>(WC?v&f" "%TMP%\!TEMP_NAME!.dat" "%TMP%\!TEMP_NAME!.enc"
+ "%~dp0.\bin\static\slunkcrypt-cli-!SUFFIX!.exe" --encrypt pass:"KVeW9;z4$#]d9~}z>(WC?v&f" "%TMP%\!TEMP_NAME!.dat" "%TMP%\!TEMP_NAME!.enc"
if not "!ERRORLEVEL!"=="0" goto:BuildFailed
- "%~dp0.\bin\%%c\slunkcrypt-cli-%%p!SUFFIX!.exe" --decrypt pass:"KVeW9;z4$#]d9~}z>(WC?v&f" "%TMP%\!TEMP_NAME!.enc" "%TMP%\!TEMP_NAME!.out"
+ "%~dp0.\bin\static\slunkcrypt-cli-!SUFFIX!.exe" --decrypt pass:"KVeW9;z4$#]d9~}z>(WC?v&f" "%TMP%\!TEMP_NAME!.enc" "%TMP%\!TEMP_NAME!.out"
if not "!ERRORLEVEL!"=="0" goto:BuildFailed
del /F "%TMP%\!TEMP_NAME!.dat" "%TMP%\!TEMP_NAME!.enc" "%TMP%\!TEMP_NAME!.out"
%ECHO% white "\n------------------------------------------------------------------------------"