From e1e6e0cf7ecfb6f8cce83dca472fbb6ee9fbd639 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 30 Sep 2013 12:47:34 -0700 Subject: [PATCH] Enable full optimization on MSVC --- libsodium.sln | 20 ++++++++++++++++++++ libsodium.vcxproj | 22 ++++++++++++---------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/libsodium.sln b/libsodium.sln index e6a8c326..28fc15b7 100644 --- a/libsodium.sln +++ b/libsodium.sln @@ -7,28 +7,48 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "libsodium.vcxp EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + DebugDLL|Any CPU = DebugDLL|Any CPU + DebugDLL|Mixed Platforms = DebugDLL|Mixed Platforms DebugDLL|Win32 = DebugDLL|Win32 DebugDLL|x64 = DebugDLL|x64 + Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x64 = Release|x64 + ReleaseDLL|Any CPU = ReleaseDLL|Any CPU + ReleaseDLL|Mixed Platforms = ReleaseDLL|Mixed Platforms ReleaseDLL|Win32 = ReleaseDLL|Win32 ReleaseDLL|x64 = ReleaseDLL|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Win32.ActiveCfg = Debug|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Win32.Build.0 = Debug|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|x64.ActiveCfg = Debug|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|x64.Build.0 = Debug|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Any CPU.ActiveCfg = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Mixed Platforms.ActiveCfg = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Mixed Platforms.Build.0 = DebugDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|x64.Build.0 = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Any CPU.ActiveCfg = Release|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Mixed Platforms.Build.0 = Release|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Win32.ActiveCfg = Release|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Win32.Build.0 = Release|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x64.ActiveCfg = Release|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x64.Build.0 = Release|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Any CPU.ActiveCfg = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Mixed Platforms.ActiveCfg = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Mixed Platforms.Build.0 = ReleaseDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 diff --git a/libsodium.vcxproj b/libsodium.vcxproj index a371b1e5..0148d71b 100644 --- a/libsodium.vcxproj +++ b/libsodium.vcxproj @@ -186,7 +186,7 @@ Level3 Disabled - inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories) 4244;%(DisableSpecificWarnings) MultiThreadedDebugDLL @@ -202,7 +202,7 @@ Level3 Disabled - inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories) 4244;%(DisableSpecificWarnings) MultiThreadedDebug @@ -218,7 +218,7 @@ Level3 Disabled - inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories) 4244;%(DisableSpecificWarnings) MultiThreadedDebugDLL @@ -233,13 +233,14 @@ Level3 - MaxSpeed + Full true true - inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories) 4244;%(DisableSpecificWarnings) MultiThreaded + Speed Console @@ -253,13 +254,14 @@ Level3 - MaxSpeed + Full true true - inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories) 4244;%(DisableSpecificWarnings) MultiThreadedDLL + Speed Console @@ -276,7 +278,7 @@ MaxSpeed true true - inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories) 4244;%(DisableSpecificWarnings) MultiThreaded @@ -296,7 +298,7 @@ MaxSpeed true true - inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories) 4244;%(DisableSpecificWarnings) MultiThreadedDLL @@ -500,4 +502,4 @@ - + \ No newline at end of file