diff --git a/.gitignore b/.gitignore index 0a37e043..9e8f0594 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.cmake *.dSYM +*.exp *.la *.lo *.log @@ -106,3 +107,5 @@ test-driver testing android-toolchain-* libsodium-android-* +/bin/ +/obj/ diff --git a/builds/msvc/.gitignore b/builds/msvc/.gitignore new file mode 100644 index 00000000..79234a2a --- /dev/null +++ b/builds/msvc/.gitignore @@ -0,0 +1,6 @@ +*.opensdf +*.suo +*.sdf +*.vcxproj.user +*.aps +*.log diff --git a/builds/msvc/libsodium.rc b/builds/msvc/libsodium.rc new file mode 100644 index 00000000..1e47e0c7 Binary files /dev/null and b/builds/msvc/libsodium.rc differ diff --git a/builds/msvc/resource.h b/builds/msvc/resource.h new file mode 100644 index 00000000..d89f84ce Binary files /dev/null and b/builds/msvc/resource.h differ diff --git a/builds/msvc/version.h b/builds/msvc/version.h new file mode 100644 index 00000000..921abe8d --- /dev/null +++ b/builds/msvc/version.h @@ -0,0 +1,29 @@ + +#ifndef __SODIUM_VERSION_H__ +#define __SODIUM_VERSION_H__ + +#include "export.h" + +#define SODIUM_VERSION_STRING "0.4.5" + +#define SODIUM_LIBRARY_VERSION_MAJOR 4 +#define SODIUM_LIBRARY_VERSION_MINOR 5 + +#ifdef __cplusplus +extern "C" { +#endif + +SODIUM_EXPORT +const char *sodium_version_string(void); + +SODIUM_EXPORT +int sodium_library_version_major(void); + +SODIUM_EXPORT +int sodium_library_version_minor(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/builds/msvc/vs2010/libsodium.import.props b/builds/msvc/vs2010/libsodium.import.props new file mode 100644 index 00000000..9ac8df1e --- /dev/null +++ b/builds/msvc/vs2010/libsodium.import.props @@ -0,0 +1,79 @@ + + + + + <_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 new file mode 100644 index 00000000..7feb9c6c --- /dev/null +++ b/builds/msvc/vs2010/libsodium.sln @@ -0,0 +1,79 @@ + +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 + DynDebug|x64 = DynDebug|x64 + DynRelease|Win32 = DynRelease|Win32 + DynRelease|x64 = DynRelease|x64 + LtcgDebug|Win32 = LtcgDebug|Win32 + LtcgDebug|x64 = LtcgDebug|x64 + LtcgRelease|Win32 = LtcgRelease|Win32 + LtcgRelease|x64 = LtcgRelease|x64 + StaticDebug|Win32 = StaticDebug|Win32 + StaticDebug|x64 = StaticDebug|x64 + StaticRelease|Win32 = StaticRelease|Win32 + StaticRelease|x64 = StaticRelease|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.Build.0 = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.ActiveCfg = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.Build.0 = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.Build.0 = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.Build.0 = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.Build.0 = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.ActiveCfg = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.Build.0 = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32 + {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 + EndGlobalSection +EndGlobal diff --git a/builds/msvc/vs2010/libsodium/libsodium.props b/builds/msvc/vs2010/libsodium/libsodium.props new file mode 100644 index 00000000..bcb9b80b --- /dev/null +++ b/builds/msvc/vs2010/libsodium/libsodium.props @@ -0,0 +1,32 @@ + + + + + <_PropertySheetDisplayName>Libsodium Common Settings + AllRules.ruleset + false + + + + + + + copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\ + + + $(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) + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj new file mode 100644 index 00000000..4afb6b30 --- /dev/null +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -0,0 +1,370 @@ + + + + {A185B162-6CB6-4502-B03F-B56F7699A8D9} + libsodium + libsodium10 + + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + + + + v100 + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters new file mode 100644 index 00000000..b8283a71 --- /dev/null +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters @@ -0,0 +1,585 @@ + + + + + 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 + + + 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 + + + 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 + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + resource + + + include + + + + + packaging + + + packaging + + + packaging + + + packaging + + + packaging + + + + + {03c1f568-fa7f-499c-a616-a8e0f5050b97} + + + {ddaca9ce-4d7d-4395-bfd2-2eda05bc80c2} + + + {b320f6a3-36a4-4b22-8c21-da7d2e12211a} + + + {983480f9-7320-4c01-b926-ee8dead5b916} + + + + + packaging + + + + + resource + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Common.props b/builds/msvc/vs2010/properties/Common.props new file mode 100644 index 00000000..2acf2e6f --- /dev/null +++ b/builds/msvc/vs2010/properties/Common.props @@ -0,0 +1,26 @@ + + + + + <_PropertySheetDisplayName>Common Settings + Unicode + $(ProjectName) + + + + + true + + UNICODE;_UNICODE;%(PreprocessorDefinitions) + Level3 + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Console.props b/builds/msvc/vs2010/properties/Console.props new file mode 100644 index 00000000..414c98ae --- /dev/null +++ b/builds/msvc/vs2010/properties/Console.props @@ -0,0 +1,20 @@ + + + + + + + + + <_PropertySheetDisplayName>Console Application + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props b/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props new file mode 100644 index 00000000..5872b5c4 --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Debug Dynamic + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..1e752c21 --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + + <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleDebugStatic.props b/builds/msvc/vs2010/properties/ConsoleDebugStatic.props new file mode 100644 index 00000000..5d72bbc4 --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleDebugStatic.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Debug Static + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props b/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props new file mode 100644 index 00000000..f15070dd --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Release Dynamic + + + + + + MultiThreadedDebugDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..984891b3 --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,20 @@ + + + + + + + + + + + <_PropertySheetDisplayName>Console Release Link Time Code Generation Library + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props b/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props new file mode 100644 index 00000000..2aaf3032 --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props @@ -0,0 +1,19 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Release Static + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Debug.props b/builds/msvc/vs2010/properties/Debug.props new file mode 100644 index 00000000..a2867772 --- /dev/null +++ b/builds/msvc/vs2010/properties/Debug.props @@ -0,0 +1,28 @@ + + + + + <_PropertySheetDisplayName>Debug Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\ + + + + ProgramDatabase + EnableFastChecks + ProgramDatabase + true + Disabled + _DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;%(PreprocessorDefinitions) + + + true + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Dynamic.props b/builds/msvc/vs2010/properties/Dynamic.props new file mode 100644 index 00000000..9e749175 --- /dev/null +++ b/builds/msvc/vs2010/properties/Dynamic.props @@ -0,0 +1,18 @@ + + + + + + + + + <_PropertySheetDisplayName>Dynamic Library + + + + + _DLL;_WINDLL;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/DynamicDebug.props b/builds/msvc/vs2010/properties/DynamicDebug.props new file mode 100644 index 00000000..ee40a01f --- /dev/null +++ b/builds/msvc/vs2010/properties/DynamicDebug.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Dynamic Debug Library + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/DynamicRelease.props b/builds/msvc/vs2010/properties/DynamicRelease.props new file mode 100644 index 00000000..c3f36f89 --- /dev/null +++ b/builds/msvc/vs2010/properties/DynamicRelease.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Dynamic Release Library + + + + + + MultiThreadedDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props new file mode 100644 index 00000000..644462f0 --- /dev/null +++ b/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props @@ -0,0 +1,20 @@ + + + + + <_PropertySheetDisplayName>Link Time Code Generation Library + + + + + true + + + UseLinkTimeCodeGeneration + + + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Release.props b/builds/msvc/vs2010/properties/Release.props new file mode 100644 index 00000000..c2111288 --- /dev/null +++ b/builds/msvc/vs2010/properties/Release.props @@ -0,0 +1,40 @@ + + + + + <_PropertySheetDisplayName>Release Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\ + false + + + + + /Oy- %(AdditionalOptions) + + true + true + OnlyExplicitInline + false + MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + + true + + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib + true + + + + + + StreamingSIMDExtensions2 + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Static.props b/builds/msvc/vs2010/properties/Static.props new file mode 100644 index 00000000..85207e49 --- /dev/null +++ b/builds/msvc/vs2010/properties/Static.props @@ -0,0 +1,18 @@ + + + + + + + + + <_PropertySheetDisplayName>Static Library + + + + + _LIB;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/StaticDebug.props b/builds/msvc/vs2010/properties/StaticDebug.props new file mode 100644 index 00000000..8668424c --- /dev/null +++ b/builds/msvc/vs2010/properties/StaticDebug.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Debug Library + + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..a35e0e7a --- /dev/null +++ b/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library + + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props new file mode 100644 index 00000000..6a8d8837 --- /dev/null +++ b/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props @@ -0,0 +1,17 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Link Time Code Generation Library + + + $(TargetName).ltcg + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/StaticRelease.props b/builds/msvc/vs2010/properties/StaticRelease.props new file mode 100644 index 00000000..5eaadae8 --- /dev/null +++ b/builds/msvc/vs2010/properties/StaticRelease.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Release Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..4515bef4 --- /dev/null +++ b/builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Release Link Time Code Generation Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Win32.props b/builds/msvc/vs2010/properties/Win32.props new file mode 100644 index 00000000..8d611a09 --- /dev/null +++ b/builds/msvc/vs2010/properties/Win32.props @@ -0,0 +1,20 @@ + + + + + <_PropertySheetDisplayName>Win32 Settings + + + + + WIN32;_WIN32;%(PreprocessorDefinitions) + + + MachineX86 + + + /MACHINE:X86 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/x64.props b/builds/msvc/vs2010/properties/x64.props new file mode 100644 index 00000000..ddf9c14a --- /dev/null +++ b/builds/msvc/vs2010/properties/x64.props @@ -0,0 +1,23 @@ + + + + + <_PropertySheetDisplayName>x64 Settings + + + + + + WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions) + + + MachineX64 + + + /MACHINE:X64 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/test/test.props b/builds/msvc/vs2010/test/test.props new file mode 100644 index 00000000..f3097cda --- /dev/null +++ b/builds/msvc/vs2010/test/test.props @@ -0,0 +1,43 @@ + + + + + <_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..13d15254 --- /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..e959e04d --- /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..5ef05ecf --- /dev/null +++ b/builds/msvc/vs2012/libsodium.import.props @@ -0,0 +1,79 @@ + + + + + <_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 new file mode 100644 index 00000000..87cf8598 --- /dev/null +++ b/builds/msvc/vs2012/libsodium.sln @@ -0,0 +1,79 @@ + +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 + DynDebug|x64 = DynDebug|x64 + DynRelease|Win32 = DynRelease|Win32 + DynRelease|x64 = DynRelease|x64 + LtcgDebug|Win32 = LtcgDebug|Win32 + LtcgDebug|x64 = LtcgDebug|x64 + LtcgRelease|Win32 = LtcgRelease|Win32 + LtcgRelease|x64 = LtcgRelease|x64 + StaticDebug|Win32 = StaticDebug|Win32 + StaticDebug|x64 = StaticDebug|x64 + StaticRelease|Win32 = StaticRelease|Win32 + StaticRelease|x64 = StaticRelease|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.Build.0 = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.ActiveCfg = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.Build.0 = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.Build.0 = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.Build.0 = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.Build.0 = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.ActiveCfg = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.Build.0 = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32 + {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 + EndGlobalSection +EndGlobal diff --git a/builds/msvc/vs2012/libsodium/libsodium.props b/builds/msvc/vs2012/libsodium/libsodium.props new file mode 100644 index 00000000..bcb9b80b --- /dev/null +++ b/builds/msvc/vs2012/libsodium/libsodium.props @@ -0,0 +1,32 @@ + + + + + <_PropertySheetDisplayName>Libsodium Common Settings + AllRules.ruleset + false + + + + + + + copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\ + + + $(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) + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj new file mode 100644 index 00000000..abdf388c --- /dev/null +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -0,0 +1,370 @@ + + + + {A185B162-6CB6-4502-B03F-B56F7699A8D9} + libsodium + libsodium11 + + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + + + + v110 + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters new file mode 100644 index 00000000..b8283a71 --- /dev/null +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters @@ -0,0 +1,585 @@ + + + + + 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 + + + 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 + + + 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 + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + resource + + + include + + + + + packaging + + + packaging + + + packaging + + + packaging + + + packaging + + + + + {03c1f568-fa7f-499c-a616-a8e0f5050b97} + + + {ddaca9ce-4d7d-4395-bfd2-2eda05bc80c2} + + + {b320f6a3-36a4-4b22-8c21-da7d2e12211a} + + + {983480f9-7320-4c01-b926-ee8dead5b916} + + + + + packaging + + + + + resource + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Common.props b/builds/msvc/vs2012/properties/Common.props new file mode 100644 index 00000000..2acf2e6f --- /dev/null +++ b/builds/msvc/vs2012/properties/Common.props @@ -0,0 +1,26 @@ + + + + + <_PropertySheetDisplayName>Common Settings + Unicode + $(ProjectName) + + + + + true + + UNICODE;_UNICODE;%(PreprocessorDefinitions) + Level3 + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Console.props b/builds/msvc/vs2012/properties/Console.props new file mode 100644 index 00000000..414c98ae --- /dev/null +++ b/builds/msvc/vs2012/properties/Console.props @@ -0,0 +1,20 @@ + + + + + + + + + <_PropertySheetDisplayName>Console Application + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleDebugDynamic.props b/builds/msvc/vs2012/properties/ConsoleDebugDynamic.props new file mode 100644 index 00000000..5872b5c4 --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleDebugDynamic.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Debug Dynamic + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..1e752c21 --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + + <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleDebugStatic.props b/builds/msvc/vs2012/properties/ConsoleDebugStatic.props new file mode 100644 index 00000000..5d72bbc4 --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleDebugStatic.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Debug Static + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props b/builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props new file mode 100644 index 00000000..f15070dd --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Release Dynamic + + + + + + MultiThreadedDebugDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..984891b3 --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,20 @@ + + + + + + + + + + + <_PropertySheetDisplayName>Console Release Link Time Code Generation Library + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleReleaseStatic.props b/builds/msvc/vs2012/properties/ConsoleReleaseStatic.props new file mode 100644 index 00000000..2aaf3032 --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleReleaseStatic.props @@ -0,0 +1,19 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Release Static + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Debug.props b/builds/msvc/vs2012/properties/Debug.props new file mode 100644 index 00000000..a2867772 --- /dev/null +++ b/builds/msvc/vs2012/properties/Debug.props @@ -0,0 +1,28 @@ + + + + + <_PropertySheetDisplayName>Debug Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\ + + + + ProgramDatabase + EnableFastChecks + ProgramDatabase + true + Disabled + _DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;%(PreprocessorDefinitions) + + + true + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Dynamic.props b/builds/msvc/vs2012/properties/Dynamic.props new file mode 100644 index 00000000..9e749175 --- /dev/null +++ b/builds/msvc/vs2012/properties/Dynamic.props @@ -0,0 +1,18 @@ + + + + + + + + + <_PropertySheetDisplayName>Dynamic Library + + + + + _DLL;_WINDLL;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/DynamicDebug.props b/builds/msvc/vs2012/properties/DynamicDebug.props new file mode 100644 index 00000000..ee40a01f --- /dev/null +++ b/builds/msvc/vs2012/properties/DynamicDebug.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Dynamic Debug Library + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/DynamicRelease.props b/builds/msvc/vs2012/properties/DynamicRelease.props new file mode 100644 index 00000000..c3f36f89 --- /dev/null +++ b/builds/msvc/vs2012/properties/DynamicRelease.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Dynamic Release Library + + + + + + MultiThreadedDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props new file mode 100644 index 00000000..644462f0 --- /dev/null +++ b/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props @@ -0,0 +1,20 @@ + + + + + <_PropertySheetDisplayName>Link Time Code Generation Library + + + + + true + + + UseLinkTimeCodeGeneration + + + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Release.props b/builds/msvc/vs2012/properties/Release.props new file mode 100644 index 00000000..c2111288 --- /dev/null +++ b/builds/msvc/vs2012/properties/Release.props @@ -0,0 +1,40 @@ + + + + + <_PropertySheetDisplayName>Release Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\ + false + + + + + /Oy- %(AdditionalOptions) + + true + true + OnlyExplicitInline + false + MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + + true + + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib + true + + + + + + StreamingSIMDExtensions2 + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Static.props b/builds/msvc/vs2012/properties/Static.props new file mode 100644 index 00000000..85207e49 --- /dev/null +++ b/builds/msvc/vs2012/properties/Static.props @@ -0,0 +1,18 @@ + + + + + + + + + <_PropertySheetDisplayName>Static Library + + + + + _LIB;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/StaticDebug.props b/builds/msvc/vs2012/properties/StaticDebug.props new file mode 100644 index 00000000..8668424c --- /dev/null +++ b/builds/msvc/vs2012/properties/StaticDebug.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Debug Library + + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..a35e0e7a --- /dev/null +++ b/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library + + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props new file mode 100644 index 00000000..6a8d8837 --- /dev/null +++ b/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props @@ -0,0 +1,17 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Link Time Code Generation Library + + + $(TargetName).ltcg + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/StaticRelease.props b/builds/msvc/vs2012/properties/StaticRelease.props new file mode 100644 index 00000000..5eaadae8 --- /dev/null +++ b/builds/msvc/vs2012/properties/StaticRelease.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Release Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..4515bef4 --- /dev/null +++ b/builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Release Link Time Code Generation Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Win32.props b/builds/msvc/vs2012/properties/Win32.props new file mode 100644 index 00000000..8d611a09 --- /dev/null +++ b/builds/msvc/vs2012/properties/Win32.props @@ -0,0 +1,20 @@ + + + + + <_PropertySheetDisplayName>Win32 Settings + + + + + WIN32;_WIN32;%(PreprocessorDefinitions) + + + MachineX86 + + + /MACHINE:X86 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/x64.props b/builds/msvc/vs2012/properties/x64.props new file mode 100644 index 00000000..ddf9c14a --- /dev/null +++ b/builds/msvc/vs2012/properties/x64.props @@ -0,0 +1,23 @@ + + + + + <_PropertySheetDisplayName>x64 Settings + + + + + + WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions) + + + MachineX64 + + + /MACHINE:X64 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/test/test.props b/builds/msvc/vs2012/test/test.props new file mode 100644 index 00000000..f3097cda --- /dev/null +++ b/builds/msvc/vs2012/test/test.props @@ -0,0 +1,43 @@ + + + + + <_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..f0f19925 --- /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..e959e04d --- /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 new file mode 100644 index 00000000..dc854609 --- /dev/null +++ b/builds/msvc/vs2013/libsodium.import.props @@ -0,0 +1,74 @@ + + + + + <_PropertySheetDisplayName>Libsodium Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.imp.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.imp.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.ltcg.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.ltcg.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium.import.xml b/builds/msvc/vs2013/libsodium.import.xml new file mode 100644 index 00000000..dbcf4e5a --- /dev/null +++ b/builds/msvc/vs2013/libsodium.import.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium.sln b/builds/msvc/vs2013/libsodium.sln new file mode 100644 index 00000000..8849e449 --- /dev/null +++ b/builds/msvc/vs2013/libsodium.sln @@ -0,0 +1,81 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30110.0 +MinimumVisualStudioVersion = 10.0.40219.1 +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 + DynDebug|x64 = DynDebug|x64 + DynRelease|Win32 = DynRelease|Win32 + DynRelease|x64 = DynRelease|x64 + LtcgDebug|Win32 = LtcgDebug|Win32 + LtcgDebug|x64 = LtcgDebug|x64 + LtcgRelease|Win32 = LtcgRelease|Win32 + LtcgRelease|x64 = LtcgRelease|x64 + StaticDebug|Win32 = StaticDebug|Win32 + StaticDebug|x64 = StaticDebug|x64 + StaticRelease|Win32 = StaticRelease|Win32 + StaticRelease|x64 = StaticRelease|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.Build.0 = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.ActiveCfg = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.Build.0 = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.Build.0 = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.Build.0 = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.Build.0 = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.ActiveCfg = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.Build.0 = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32 + {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 + EndGlobalSection +EndGlobal diff --git a/builds/msvc/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props new file mode 100644 index 00000000..bcb9b80b --- /dev/null +++ b/builds/msvc/vs2013/libsodium/libsodium.props @@ -0,0 +1,32 @@ + + + + + <_PropertySheetDisplayName>Libsodium Common Settings + AllRules.ruleset + false + + + + + + + copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\ + + + $(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) + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj new file mode 100644 index 00000000..557c8fb8 --- /dev/null +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -0,0 +1,370 @@ + + + + {A185B162-6CB6-4502-B03F-B56F7699A8D9} + libsodium + libsodium12 + + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + + + + v120 + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters new file mode 100644 index 00000000..b8283a71 --- /dev/null +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters @@ -0,0 +1,585 @@ + + + + + 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 + + + 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 + + + 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 + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + resource + + + include + + + + + packaging + + + packaging + + + packaging + + + packaging + + + packaging + + + + + {03c1f568-fa7f-499c-a616-a8e0f5050b97} + + + {ddaca9ce-4d7d-4395-bfd2-2eda05bc80c2} + + + {b320f6a3-36a4-4b22-8c21-da7d2e12211a} + + + {983480f9-7320-4c01-b926-ee8dead5b916} + + + + + packaging + + + + + resource + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Common.props b/builds/msvc/vs2013/properties/Common.props new file mode 100644 index 00000000..2acf2e6f --- /dev/null +++ b/builds/msvc/vs2013/properties/Common.props @@ -0,0 +1,26 @@ + + + + + <_PropertySheetDisplayName>Common Settings + Unicode + $(ProjectName) + + + + + true + + UNICODE;_UNICODE;%(PreprocessorDefinitions) + Level3 + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Console.props b/builds/msvc/vs2013/properties/Console.props new file mode 100644 index 00000000..414c98ae --- /dev/null +++ b/builds/msvc/vs2013/properties/Console.props @@ -0,0 +1,20 @@ + + + + + + + + + <_PropertySheetDisplayName>Console Application + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleDebugDynamic.props b/builds/msvc/vs2013/properties/ConsoleDebugDynamic.props new file mode 100644 index 00000000..5872b5c4 --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleDebugDynamic.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Debug Dynamic + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..1e752c21 --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + + <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleDebugStatic.props b/builds/msvc/vs2013/properties/ConsoleDebugStatic.props new file mode 100644 index 00000000..5d72bbc4 --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleDebugStatic.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Debug Static + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props b/builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props new file mode 100644 index 00000000..f15070dd --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Release Dynamic + + + + + + MultiThreadedDebugDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..984891b3 --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,20 @@ + + + + + + + + + + + <_PropertySheetDisplayName>Console Release Link Time Code Generation Library + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleReleaseStatic.props b/builds/msvc/vs2013/properties/ConsoleReleaseStatic.props new file mode 100644 index 00000000..2aaf3032 --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleReleaseStatic.props @@ -0,0 +1,19 @@ + + + + + + + + + + <_PropertySheetDisplayName>Console Release Static + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Debug.props b/builds/msvc/vs2013/properties/Debug.props new file mode 100644 index 00000000..a2867772 --- /dev/null +++ b/builds/msvc/vs2013/properties/Debug.props @@ -0,0 +1,28 @@ + + + + + <_PropertySheetDisplayName>Debug Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\ + + + + ProgramDatabase + EnableFastChecks + ProgramDatabase + true + Disabled + _DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;%(PreprocessorDefinitions) + + + true + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Dynamic.props b/builds/msvc/vs2013/properties/Dynamic.props new file mode 100644 index 00000000..9e749175 --- /dev/null +++ b/builds/msvc/vs2013/properties/Dynamic.props @@ -0,0 +1,18 @@ + + + + + + + + + <_PropertySheetDisplayName>Dynamic Library + + + + + _DLL;_WINDLL;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/DynamicDebug.props b/builds/msvc/vs2013/properties/DynamicDebug.props new file mode 100644 index 00000000..ee40a01f --- /dev/null +++ b/builds/msvc/vs2013/properties/DynamicDebug.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Dynamic Debug Library + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/DynamicRelease.props b/builds/msvc/vs2013/properties/DynamicRelease.props new file mode 100644 index 00000000..c3f36f89 --- /dev/null +++ b/builds/msvc/vs2013/properties/DynamicRelease.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Dynamic Release Library + + + + + + MultiThreadedDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props new file mode 100644 index 00000000..644462f0 --- /dev/null +++ b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props @@ -0,0 +1,20 @@ + + + + + <_PropertySheetDisplayName>Link Time Code Generation Library + + + + + true + + + UseLinkTimeCodeGeneration + + + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Release.props b/builds/msvc/vs2013/properties/Release.props new file mode 100644 index 00000000..c2111288 --- /dev/null +++ b/builds/msvc/vs2013/properties/Release.props @@ -0,0 +1,40 @@ + + + + + <_PropertySheetDisplayName>Release Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\ + false + + + + + /Oy- %(AdditionalOptions) + + true + true + OnlyExplicitInline + false + MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + + true + + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib + true + + + + + + StreamingSIMDExtensions2 + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Static.props b/builds/msvc/vs2013/properties/Static.props new file mode 100644 index 00000000..85207e49 --- /dev/null +++ b/builds/msvc/vs2013/properties/Static.props @@ -0,0 +1,18 @@ + + + + + + + + + <_PropertySheetDisplayName>Static Library + + + + + _LIB;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticDebug.props b/builds/msvc/vs2013/properties/StaticDebug.props new file mode 100644 index 00000000..8668424c --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticDebug.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Debug Library + + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..a35e0e7a --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library + + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props new file mode 100644 index 00000000..6a8d8837 --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props @@ -0,0 +1,17 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Link Time Code Generation Library + + + $(TargetName).ltcg + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticRelease.props b/builds/msvc/vs2013/properties/StaticRelease.props new file mode 100644 index 00000000..5eaadae8 --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticRelease.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Release Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..4515bef4 --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_PropertySheetDisplayName>Static Release Link Time Code Generation Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Win32.props b/builds/msvc/vs2013/properties/Win32.props new file mode 100644 index 00000000..8d611a09 --- /dev/null +++ b/builds/msvc/vs2013/properties/Win32.props @@ -0,0 +1,20 @@ + + + + + <_PropertySheetDisplayName>Win32 Settings + + + + + WIN32;_WIN32;%(PreprocessorDefinitions) + + + MachineX86 + + + /MACHINE:X86 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/x64.props b/builds/msvc/vs2013/properties/x64.props new file mode 100644 index 00000000..ddf9c14a --- /dev/null +++ b/builds/msvc/vs2013/properties/x64.props @@ -0,0 +1,23 @@ + + + + + <_PropertySheetDisplayName>x64 Settings + + + + + + WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions) + + + MachineX64 + + + /MACHINE:X64 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/test/test.props b/builds/msvc/vs2013/test/test.props new file mode 100644 index 00000000..f3097cda --- /dev/null +++ b/builds/msvc/vs2013/test/test.props @@ -0,0 +1,43 @@ + + + + + <_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/vs2013/test/test.runner.bat b/builds/msvc/vs2013/test/test.runner.bat new file mode 100644 index 00000000..cd7e7914 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj new file mode 100644 index 00000000..6f4815f7 --- /dev/null +++ b/builds/msvc/vs2013/test/test.vcxproj @@ -0,0 +1,288 @@ + + + + {4EDBA07C-2F08-4C9E-805F-A4921814C117} + test + test12 + + + v120 + 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/vs2013/test/test.vcxproj.filters b/builds/msvc/vs2013/test/test.vcxproj.filters new file mode 100644 index 00000000..e959e04d --- /dev/null +++ b/builds/msvc/vs2013/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/packaging/nuget/.gitignore b/packaging/nuget/.gitignore new file mode 100644 index 00000000..a7aeaaa1 --- /dev/null +++ b/packaging/nuget/.gitignore @@ -0,0 +1 @@ +*.nupkg diff --git a/packaging/nuget/package.bat b/packaging/nuget/package.bat new file mode 100644 index 00000000..f0d3470f --- /dev/null +++ b/packaging/nuget/package.bat @@ -0,0 +1,13 @@ +@ECHO OFF +ECHO Started nuget packaging build. +ECHO. +REM: http://www.nuget.org/packages/gslgen +gslgen -q -script:package.gsl package.config +ECHO. +REM: http://nuget.codeplex.com/releases +nuget pack package.nuspec -verbosity detailed +ECHO. +ECHO NOTE: Ignore warnings not applicable to native code: "Issue: Assembly outside lib folder." +ECHO. +ECHO Completed nuget packaging build. The package is in the following folder: +CD \ No newline at end of file diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config new file mode 100644 index 00000000..2cc46ae0 --- /dev/null +++ b/packaging/nuget/package.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl new file mode 100644 index 00000000..f2f07457 --- /dev/null +++ b/packaging/nuget/package.gsl @@ -0,0 +1,307 @@ +.# Generate NuGet nuspec file (for subsequent packing). +.# +.# This is a code generator built using the iMatix GSL code generation +.# language. See https://github.com/imatix/gsl for details. This script +.# is licensed under MIT/X11. +.# +.echo "Generating package.nuspec from template." +.output "package.nuspec" + + + + + $(package.id) + $(package.version) + $(package.id) + libsodium contributors + Eric Voskuil + https://raw.github.com/jedisct1/libsodium/master/LICENSE + 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 + 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 + (c) 2013-2014, Frank Denis (attribution required) + native, NaCl, salt, sodium, libodium, C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +.echo "Generating package.targets from template." +.output "package.targets" + + + + + + + + + + + + + $\(MSBuildThisFileDirectory)include\\;%(AdditionalIncludeDirectories) + + + $\(MSBuildThisFileDirectory)bin\\;%(AdditionalLibraryDirectories) + + + + + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + +.echo "Generating package.xml (ui extension) from template." +.output "package.xml" + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec new file mode 100644 index 00000000..20dd0f61 --- /dev/null +++ b/packaging/nuget/package.nuspec @@ -0,0 +1,146 @@ + + + + + libsodium_vc120 + 0.4.5.1 + libsodium_vc120 + libsodium contributors + Eric Voskuil + https://raw.github.com/jedisct1/libsodium/master/LICENSE + 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 + 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 + (c) 2013-2014, Frank Denis (attribution required) + native, NaCl, salt, sodium, libodium, C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/nuget/package.targets b/packaging/nuget/package.targets new file mode 100644 index 00000000..5efd4f76 --- /dev/null +++ b/packaging/nuget/package.targets @@ -0,0 +1,127 @@ + + + + + + + + + + + + + $(MSBuildThisFileDirectory)include\;%(AdditionalIncludeDirectories) + + + $(MSBuildThisFileDirectory)bin\;%(AdditionalLibraryDirectories) + + + + + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + + libsodium-x86-v120-mt-s-0_4_5_1.lib;%(AdditionalDependencies) + + + + + libsodium-x86-v120-mt-sgd-0_4_5_1.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-s-0_4_5_1.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-sgd-0_4_5_1.lib;%(AdditionalDependencies) + + + + + + + libsodium-x86-v120-mt-s-0_4_5_1.ltcg.lib;%(AdditionalDependencies) + + + + + libsodium-x86-v120-mt-sgd-0_4_5_1.ltcg.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-s-0_4_5_1.ltcg.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-sgd-0_4_5_1.ltcg.lib;%(AdditionalDependencies) + + + + + + + libsodium-x86-v120-mt-0_4_5_1.imp.lib;%(AdditionalDependencies) + + + + + libsodium-x86-v120-mt-gd-0_4_5_1.imp.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-0_4_5_1.imp.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-gd-0_4_5_1.imp.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/nuget/package.xml b/packaging/nuget/package.xml new file mode 100644 index 00000000..abaea230 --- /dev/null +++ b/packaging/nuget/package.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file