diff --git a/libsodium.sln b/libsodium.sln
index 28fc15b7..e6a8c326 100644
--- a/libsodium.sln
+++ b/libsodium.sln
@@ -7,48 +7,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "libsodium.vcxp
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
- DebugDLL|Any CPU = DebugDLL|Any CPU
- DebugDLL|Mixed Platforms = DebugDLL|Mixed Platforms
DebugDLL|Win32 = DebugDLL|Win32
DebugDLL|x64 = DebugDLL|x64
- Release|Any CPU = Release|Any CPU
- Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
Release|x64 = Release|x64
- ReleaseDLL|Any CPU = ReleaseDLL|Any CPU
- ReleaseDLL|Mixed Platforms = ReleaseDLL|Mixed Platforms
ReleaseDLL|Win32 = ReleaseDLL|Win32
ReleaseDLL|x64 = ReleaseDLL|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Win32.ActiveCfg = Debug|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Win32.Build.0 = Debug|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|x64.ActiveCfg = Debug|x64
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|x64.Build.0 = Debug|x64
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Any CPU.ActiveCfg = DebugDLL|Win32
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Mixed Platforms.ActiveCfg = DebugDLL|Win32
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Mixed Platforms.Build.0 = DebugDLL|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|x64.Build.0 = DebugDLL|x64
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Any CPU.ActiveCfg = Release|Win32
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Mixed Platforms.Build.0 = Release|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Win32.ActiveCfg = Release|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Win32.Build.0 = Release|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x64.ActiveCfg = Release|x64
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x64.Build.0 = Release|x64
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Any CPU.ActiveCfg = ReleaseDLL|Win32
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Mixed Platforms.ActiveCfg = ReleaseDLL|Win32
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Mixed Platforms.Build.0 = ReleaseDLL|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
diff --git a/libsodium.vcxproj b/libsodium.vcxproj
index f3823a87..74f5d412 100644
--- a/libsodium.vcxproj
+++ b/libsodium.vcxproj
@@ -101,27 +101,35 @@
+
+
+
+
+
+
+
+
@@ -170,8 +178,7 @@
Level3
Disabled
- inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(SolutionDir);$(SolutionDir)\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+ SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
4244;%(DisableSpecificWarnings)
MultiThreadedDebug
@@ -179,10 +186,6 @@
Console
true
-
- $(SolutionDir)msvc-scripts\process.bat
- Process .in files
-
@@ -190,8 +193,7 @@
Level3
Disabled
- _CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+ SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
4244;%(DisableSpecificWarnings)
MultiThreadedDebugDLL
@@ -199,10 +201,6 @@
Console
true
-
- $(VC_SourcePath)/msvc-scripts/process.bat
- Process .in files
-
@@ -210,8 +208,7 @@
Level3
Disabled
- _CRT_SECURE_NO_WARNINGS;SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+ SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
4244;%(DisableSpecificWarnings)
MultiThreadedDebug
@@ -226,8 +223,7 @@
Level3
Disabled
- _CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+ SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
4244;%(DisableSpecificWarnings)
MultiThreadedDebugDLL
@@ -244,8 +240,7 @@
Full
true
true
- _CRT_SECURE_NO_WARNINGS;SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+ SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
4244;%(DisableSpecificWarnings)
MultiThreaded
Speed
@@ -256,10 +251,6 @@
true
true
-
- $(VC_SourcePath)/msvc-scripts/process.bat
- Process .in files
-
@@ -269,8 +260,7 @@
Full
true
true
- _CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+ SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
4244;%(DisableSpecificWarnings)
MultiThreadedDLL
Speed
@@ -281,10 +271,6 @@
true
true
-
- $(VC_SourcePath)/msvc-scripts/process.bat
- Process .in files
-
@@ -294,8 +280,7 @@
MaxSpeed
true
true
- _CRT_SECURE_NO_WARNINGS;SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+ SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
4244;%(DisableSpecificWarnings)
MultiThreaded
@@ -314,8 +299,7 @@
MaxSpeed
true
true
- _CRT_SECURE_NO_WARNINGS;SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(SolutionDir);$(SolutionDir)..\..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+ SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
4244;%(DisableSpecificWarnings)
MultiThreadedDLL
@@ -418,7 +402,6 @@
-
diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters
index 6e494188..dd597287 100644
--- a/libsodium.vcxproj.filters
+++ b/libsodium.vcxproj.filters
@@ -292,9 +292,6 @@
Source Files
-
- Source Files
-
Source Files
diff --git a/msvc-scripts/sodium.props b/msvc-scripts/sodium.props
new file mode 100644
index 00000000..568d196d
--- /dev/null
+++ b/msvc-scripts/sodium.props
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+ $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)
+ inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)
+
+
+ $(SolutionDir)/msvc-scripts/process.bat
+
+
+ Process .in files
+
+
+
+
\ No newline at end of file