diff --git a/builds/msvc/vs2010/libsodium.import.props b/builds/msvc/vs2010/libsodium.import.props
new file mode 100644
index 00000000..9a99828f
--- /dev/null
+++ b/builds/msvc/vs2010/libsodium.import.props
@@ -0,0 +1,80 @@
+
+
+
+
+ <_ProjectFileVersion>10.0.40219.1
+ <_PropertySheetDisplayName>Libsodium Import Settings
+
+
+
+
+
+
+
+
+
+
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)
+
+
+
+
+
+ SODIUM_STATIC;%(PreprocessorDefinitions)
+
+
+
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.imp.lib;%(AdditionalDependencies)
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.imp.lib;%(AdditionalDependencies)
+
+
+
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.lib;%(AdditionalDependencies)
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.lib;%(AdditionalDependencies)
+
+
+
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.ltcg.lib;%(AdditionalDependencies)
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.ltcg.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/builds/msvc/vs2010/libsodium.import.xml b/builds/msvc/vs2010/libsodium.import.xml
new file mode 100644
index 00000000..dbcf4e5a
--- /dev/null
+++ b/builds/msvc/vs2010/libsodium.import.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/builds/msvc/vs2010/libsodium.sln b/builds/msvc/vs2010/libsodium.sln
index 8ca871bf..7feb9c6c 100644
--- a/builds/msvc/vs2010/libsodium.sln
+++ b/builds/msvc/vs2010/libsodium.sln
@@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "libsodium\libsodium.vcxproj", "{A185B162-6CB6-4502-B03F-B56F7699A8D9}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{4EDBA07C-2F08-4C9E-805F-A4921814C117}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A185B162-6CB6-4502-B03F-B56F7699A8D9} = {A185B162-6CB6-4502-B03F-B56F7699A8D9}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DynDebug|Win32 = DynDebug|Win32
@@ -43,6 +48,30 @@ Global
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|x64.Build.0 = DebugDEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|x64.Build.0 = DebugSEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/builds/msvc/vs2010/libsodium/libsodium.props b/builds/msvc/vs2010/libsodium/libsodium.props
index 0b13e4bf..1aaadddd 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.props
+++ b/builds/msvc/vs2010/libsodium/libsodium.props
@@ -7,25 +7,15 @@
AllRules.ruleset
false
-
+
$(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)
4146;4244;%(DisableSpecificWarnings)
false
inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
-
-
-
-
-
- SODIUM_STATIC;%(PreprocessorDefinitions)
-
-
-
-
-
- DLL_EXPORT;%(PreprocessorDefinitions)
+ SODIUM_STATIC;%(PreprocessorDefinitions)
+ DLL_EXPORT;%(PreprocessorDefinitions)
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
index 805f7e01..260afb56 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
@@ -391,6 +391,12 @@
src
+
+ src
+
+
+ src
+
diff --git a/builds/msvc/vs2010/test/test.props b/builds/msvc/vs2010/test/test.props
new file mode 100644
index 00000000..6cdfca54
--- /dev/null
+++ b/builds/msvc/vs2010/test/test.props
@@ -0,0 +1,44 @@
+
+
+
+
+ <_ProjectFileVersion>10.0.40219.1
+ <_PropertySheetDisplayName>Libsodium Test Common Settings
+ AllRules.ruleset
+ false
+
+
+
+
+
+
+ $(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories)
+ false
+ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+ dynamic
+
+
+ ltcg
+
+
+ static
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/builds/msvc/vs2010/test/test.runner.bat b/builds/msvc/vs2010/test/test.runner.bat
new file mode 100644
index 00000000..cd7e7914
--- /dev/null
+++ b/builds/msvc/vs2010/test/test.runner.bat
@@ -0,0 +1,78 @@
+REM WORK IN PROGRESS
+
+@ECHO OFF
+
+if "%1" == "" (
+ echo "Usage: wintest.bat NUL 2>&1
+ if not exist %%f.exe (
+ echo %%f compile failed
+ goto :END
+ )
+ %%f.exe
+ if errorlevel 1 (
+ echo %%f failed
+ ) else (
+ echo %%f ok
+ )
+)
+REM Remove temporary files
+del *.exe *.obj *.res *.exp *.pdb
+
+:END
diff --git a/builds/msvc/vs2010/test/test.vcxproj b/builds/msvc/vs2010/test/test.vcxproj
new file mode 100644
index 00000000..6daaefb3
--- /dev/null
+++ b/builds/msvc/vs2010/test/test.vcxproj
@@ -0,0 +1,288 @@
+
+
+
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}
+ test
+ test10
+
+
+ v100
+ Application
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DebugDEXE
+ Win32
+
+
+ ReleaseDEXE
+ Win32
+
+
+ DebugDEXE
+ x64
+
+
+ ReleaseDEXE
+ x64
+
+
+ DebugLEXE
+ Win32
+
+
+ ReleaseLEXE
+ Win32
+
+
+ DebugLEXE
+ x64
+
+
+ ReleaseLEXE
+ x64
+
+
+ DebugSEXE
+ Win32
+
+
+ ReleaseSEXE
+ Win32
+
+
+ DebugSEXE
+ x64
+
+
+ ReleaseSEXE
+ x64
+
+
+
+
+ false
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/builds/msvc/vs2010/test/test.vcxproj.filters b/builds/msvc/vs2010/test/test.vcxproj.filters
new file mode 100644
index 00000000..a58b55c5
--- /dev/null
+++ b/builds/msvc/vs2010/test/test.vcxproj.filters
@@ -0,0 +1,162 @@
+
+
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+
+
+ include
+
+
+ include
+
+
+
+
+ {705beade-aa7f-49c0-900e-4b0cbbdc2f7b}
+
+
+ {5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}
+
+
+
\ No newline at end of file
diff --git a/builds/msvc/vs2012/libsodium.import.props b/builds/msvc/vs2012/libsodium.import.props
new file mode 100644
index 00000000..0e27e5dc
--- /dev/null
+++ b/builds/msvc/vs2012/libsodium.import.props
@@ -0,0 +1,80 @@
+
+
+
+
+ <_ProjectFileVersion>10.0.40219.1
+ <_PropertySheetDisplayName>Libsodium Import Settings
+
+
+
+
+
+
+
+
+
+
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)
+
+
+
+
+
+ SODIUM_STATIC;%(PreprocessorDefinitions)
+
+
+
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.imp.lib;%(AdditionalDependencies)
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.imp.lib;%(AdditionalDependencies)
+
+
+
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.lib;%(AdditionalDependencies)
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.lib;%(AdditionalDependencies)
+
+
+
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.ltcg.lib;%(AdditionalDependencies)
+
+
+ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.ltcg.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/builds/msvc/vs2012/libsodium.import.xml b/builds/msvc/vs2012/libsodium.import.xml
new file mode 100644
index 00000000..dbcf4e5a
--- /dev/null
+++ b/builds/msvc/vs2012/libsodium.import.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/builds/msvc/vs2012/libsodium.sln b/builds/msvc/vs2012/libsodium.sln
index b75f7732..87cf8598 100644
--- a/builds/msvc/vs2012/libsodium.sln
+++ b/builds/msvc/vs2012/libsodium.sln
@@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "libsodium\libsodium.vcxproj", "{A185B162-6CB6-4502-B03F-B56F7699A8D9}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{4EDBA07C-2F08-4C9E-805F-A4921814C117}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A185B162-6CB6-4502-B03F-B56F7699A8D9} = {A185B162-6CB6-4502-B03F-B56F7699A8D9}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DynDebug|Win32 = DynDebug|Win32
@@ -43,6 +48,30 @@ Global
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|x64.Build.0 = DebugDEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|x64.Build.0 = DebugSEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/builds/msvc/vs2012/libsodium/libsodium.props b/builds/msvc/vs2012/libsodium/libsodium.props
index 0b13e4bf..1aaadddd 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.props
+++ b/builds/msvc/vs2012/libsodium/libsodium.props
@@ -7,25 +7,15 @@
AllRules.ruleset
false
-
+
$(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)
4146;4244;%(DisableSpecificWarnings)
false
inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
-
-
-
-
-
- SODIUM_STATIC;%(PreprocessorDefinitions)
-
-
-
-
-
- DLL_EXPORT;%(PreprocessorDefinitions)
+ SODIUM_STATIC;%(PreprocessorDefinitions)
+ DLL_EXPORT;%(PreprocessorDefinitions)
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
index 805f7e01..260afb56 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
@@ -391,6 +391,12 @@
src
+
+ src
+
+
+ src
+
diff --git a/builds/msvc/vs2012/test/test.props b/builds/msvc/vs2012/test/test.props
new file mode 100644
index 00000000..6cdfca54
--- /dev/null
+++ b/builds/msvc/vs2012/test/test.props
@@ -0,0 +1,44 @@
+
+
+
+
+ <_ProjectFileVersion>10.0.40219.1
+ <_PropertySheetDisplayName>Libsodium Test Common Settings
+ AllRules.ruleset
+ false
+
+
+
+
+
+
+ $(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories)
+ false
+ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+ dynamic
+
+
+ ltcg
+
+
+ static
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/builds/msvc/vs2012/test/test.runner.bat b/builds/msvc/vs2012/test/test.runner.bat
new file mode 100644
index 00000000..cd7e7914
--- /dev/null
+++ b/builds/msvc/vs2012/test/test.runner.bat
@@ -0,0 +1,78 @@
+REM WORK IN PROGRESS
+
+@ECHO OFF
+
+if "%1" == "" (
+ echo "Usage: wintest.bat NUL 2>&1
+ if not exist %%f.exe (
+ echo %%f compile failed
+ goto :END
+ )
+ %%f.exe
+ if errorlevel 1 (
+ echo %%f failed
+ ) else (
+ echo %%f ok
+ )
+)
+REM Remove temporary files
+del *.exe *.obj *.res *.exp *.pdb
+
+:END
diff --git a/builds/msvc/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj
new file mode 100644
index 00000000..1eea80a4
--- /dev/null
+++ b/builds/msvc/vs2012/test/test.vcxproj
@@ -0,0 +1,288 @@
+
+
+
+ {4EDBA07C-2F08-4C9E-805F-A4921814C117}
+ test
+ test11
+
+
+ v110
+ Application
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DebugDEXE
+ Win32
+
+
+ ReleaseDEXE
+ Win32
+
+
+ DebugDEXE
+ x64
+
+
+ ReleaseDEXE
+ x64
+
+
+ DebugLEXE
+ Win32
+
+
+ ReleaseLEXE
+ Win32
+
+
+ DebugLEXE
+ x64
+
+
+ ReleaseLEXE
+ x64
+
+
+ DebugSEXE
+ Win32
+
+
+ ReleaseSEXE
+ Win32
+
+
+ DebugSEXE
+ x64
+
+
+ ReleaseSEXE
+ x64
+
+
+
+
+ false
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/builds/msvc/vs2012/test/test.vcxproj.filters b/builds/msvc/vs2012/test/test.vcxproj.filters
new file mode 100644
index 00000000..a58b55c5
--- /dev/null
+++ b/builds/msvc/vs2012/test/test.vcxproj.filters
@@ -0,0 +1,162 @@
+
+
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+
+
+ include
+
+
+ include
+
+
+
+
+ {705beade-aa7f-49c0-900e-4b0cbbdc2f7b}
+
+
+ {5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}
+
+
+
\ No newline at end of file
diff --git a/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props
index 099e7939..960e2edd 100644
--- a/builds/msvc/vs2013/libsodium.import.props
+++ b/builds/msvc/vs2013/libsodium.import.props
@@ -12,21 +12,16 @@
-
+
$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)
-
-
-
-
-
- SODIUM_STATIC;%(PreprocessorDefinitions)
+ SODIUM_STATIC;%(PreprocessorDefinitions)
-
+
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.imp.lib;%(AdditionalDependencies)
@@ -53,7 +48,7 @@
-
+
-
+
diff --git a/builds/msvc/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props
index 0b13e4bf..1aaadddd 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.props
+++ b/builds/msvc/vs2013/libsodium/libsodium.props
@@ -7,25 +7,15 @@
AllRules.ruleset
false
-
+
$(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)
4146;4244;%(DisableSpecificWarnings)
false
inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
-
-
-
-
-
- SODIUM_STATIC;%(PreprocessorDefinitions)
-
-
-
-
-
- DLL_EXPORT;%(PreprocessorDefinitions)
+ SODIUM_STATIC;%(PreprocessorDefinitions)
+ DLL_EXPORT;%(PreprocessorDefinitions)
diff --git a/builds/msvc/vs2013/test/test.props b/builds/msvc/vs2013/test/test.props
index 7e33471e..6cdfca54 100644
--- a/builds/msvc/vs2013/test/test.props
+++ b/builds/msvc/vs2013/test/test.props
@@ -13,20 +13,13 @@
$(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories)
-
false
_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
-
+
-
-
- SODIUM_STATIC;%(PreprocessorDefinitions)
-
-
-
-
+
diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj
index 59a61deb..6f4815f7 100644
--- a/builds/msvc/vs2013/test/test.vcxproj
+++ b/builds/msvc/vs2013/test/test.vcxproj
@@ -11,13 +11,13 @@
-
+
-
+
diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl
index 9ec8d4c6..f2f07457 100644
--- a/packaging/nuget/package.gsl
+++ b/packaging/nuget/package.gsl
@@ -23,7 +23,7 @@
https://github.com/jedisct1/libsodium
http://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Salt_shaker_on_white_background.jpg/220px-Salt_shaker_on_white_background.jpg
true
- true
+ false
Sodium is a portable, cross-compilable, installable, packageable fork of NaCl (based on the latest released upstream version nacl-20110221), with a compatible API.
Portable fork of NaCl, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers.
https://raw.github.com/jedisct1/libsodium/master/ChangeLog