diff --git a/builds/msvc/properties/Debug.props b/builds/msvc/properties/Debug.props index 56880de2..6fa74196 100644 --- a/builds/msvc/properties/Debug.props +++ b/builds/msvc/properties/Debug.props @@ -11,7 +11,7 @@ - ProgramDatabase + EnableFastChecks ProgramDatabase true diff --git a/builds/msvc/properties/DebugLIB.props b/builds/msvc/properties/DebugLIB.props index 8c7a3086..c5f10128 100644 --- a/builds/msvc/properties/DebugLIB.props +++ b/builds/msvc/properties/DebugLIB.props @@ -12,6 +12,7 @@ + OldStyle MultiThreadedDebug true diff --git a/builds/msvc/properties/DebugLTCG.props b/builds/msvc/properties/DebugLTCG.props index 8dafd5f4..42b22ffe 100644 --- a/builds/msvc/properties/DebugLTCG.props +++ b/builds/msvc/properties/DebugLTCG.props @@ -12,6 +12,7 @@ + OldStyle MultiThreadedDebug diff --git a/builds/msvc/resource.rc b/builds/msvc/resource.rc index 662ee604..ead7e21e 100644 Binary files a/builds/msvc/resource.rc and b/builds/msvc/resource.rc differ diff --git a/builds/msvc/vs2010/libsodium.import.props b/builds/msvc/vs2010/libsodium.import.props index f101769a..2f4a7e73 100644 --- a/builds/msvc/vs2010/libsodium.import.props +++ b/builds/msvc/vs2010/libsodium.import.props @@ -19,7 +19,7 @@ SODIUM_STATIC;%(PreprocessorDefinitions) - advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies) + advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) diff --git a/builds/msvc/vs2012/libsodium.import.props b/builds/msvc/vs2012/libsodium.import.props index f101769a..2f4a7e73 100644 --- a/builds/msvc/vs2012/libsodium.import.props +++ b/builds/msvc/vs2012/libsodium.import.props @@ -19,7 +19,7 @@ SODIUM_STATIC;%(PreprocessorDefinitions) - advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies) + advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) diff --git a/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props index f101769a..2f4a7e73 100644 --- a/builds/msvc/vs2013/libsodium.import.props +++ b/builds/msvc/vs2013/libsodium.import.props @@ -19,7 +19,7 @@ SODIUM_STATIC;%(PreprocessorDefinitions) - advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies) + advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec index 7710c467..114ac4c6 100644 --- a/packaging/nuget/package.nuspec +++ b/packaging/nuget/package.nuspec @@ -21,6 +21,8 @@ https://raw.github.com/jedisct1/libsodium/master/ChangeLog (c) 2013-2014, Frank Denis (attribution required) native, NaCl, salt, sodium, libodium, C++ + + @@ -38,52 +40,52 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -30,66 +30,66 @@ - libsodium-x86-v120-mt-s-0_5_0_0.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-s-0_5_1_0.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-sgd-0_5_0_0.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-sgd-0_5_1_0.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-s-0_5_0_0.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-s-0_5_1_0.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-sgd-0_5_0_0.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-sgd-0_5_1_0.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-s-0_5_0_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-s-0_5_1_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-sgd-0_5_0_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-sgd-0_5_1_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-s-0_5_0_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-s-0_5_1_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-sgd-0_5_0_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-sgd-0_5_1_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-0_5_0_0.imp.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-0_5_1_0.imp.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-gd-0_5_0_0.imp.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-gd-0_5_1_0.imp.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-0_5_0_0.imp.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-0_5_1_0.imp.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-gd-0_5_0_0.imp.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-gd-0_5_1_0.imp.lib;%(AdditionalDependencies) @@ -98,26 +98,26 @@ - - + + - - + + - - + + - - + +