From 9e29561707684af1f1b74a279ab64ef8b8c52e8b Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Wed, 10 Nov 2021 19:38:35 +0100 Subject: [PATCH] Refactored project/solution files. --- Slunk.sln | 14 -- .../cpu-capabilities/cpu-capabilities-x64.dll | Bin 7168 -> 6144 bytes .../cpu-capabilities/cpu-capabilities-x86.dll | Bin 6656 -> 6144 bytes frontend/SlunkCrypt.vcxproj | 138 +++-------------- gui/Process/SlunkCryptRunner.cs | 4 +- gui/SlunkCryptGUI.csproj | 4 +- libslunkcrypt/libSlunkCrypt.vcxproj | 144 +++--------------- mk-profiled.cmd | 6 +- 8 files changed, 45 insertions(+), 265 deletions(-) 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 d483af3c91e7a8e26739e97b84b0664a0cd280c2..2c9fafd25d74766079e5780d2cdbbf6c5de66724 100644 GIT binary patch literal 6144 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 diff --git a/etc/deps/cpu-capabilities/cpu-capabilities-x86.dll b/etc/deps/cpu-capabilities/cpu-capabilities-x86.dll index 7a47a83cb799a097f0104dd2b6057f475fa77a9c..59925f07be382460695fcded3b5b785d16728945 100644 GIT binary patch literal 6144 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 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------------------------------------------------------------------------------"