diff --git a/Makefile.am b/Makefile.am
index f5e24ab6..1dc2f0e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,6 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
autogen.sh \
- libsodium.sln \
- libsodium.vcxproj \
- libsodium.vcxproj.filters \
LICENSE \
README.markdown \
THANKS
@@ -12,7 +9,6 @@ EXTRA_DIST = \
SUBDIRS = \
builds \
dist-build \
- msvc-scripts \
src \
test
diff --git a/appveyor.yml b/appveyor.yml
index 5e6bff55..f272ff6c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,5 +20,5 @@ init: msbuild /version
build:
parallel: true
- project: libsodium.vcxproj
- verbosity: minimal
+ project: ci/appveyor/libsodium.vcxproj
+ verbosity: normal
diff --git a/libsodium.sln b/ci/appveyor/libsodium.sln
similarity index 100%
rename from libsodium.sln
rename to ci/appveyor/libsodium.sln
diff --git a/ci/appveyor/libsodium.vcxproj b/ci/appveyor/libsodium.vcxproj
new file mode 100644
index 00000000..9a8a34be
--- /dev/null
+++ b/ci/appveyor/libsodium.vcxproj
@@ -0,0 +1,595 @@
+
+
+
+
+ DebugDLL
+ Win32
+
+
+ DebugDLL
+ x64
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ ReleaseDLL
+ Win32
+
+
+ ReleaseDLL
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {A185B162-6CB6-4502-B03F-B56F7699A8D9}
+ Win32Proj
+ libsodium
+
+
+
+ StaticLibrary
+ true
+ MultiByte
+ false
+ v140
+
+
+ DynamicLibrary
+ true
+ MultiByte
+ false
+ v140
+
+
+ StaticLibrary
+ true
+ MultiByte
+ false
+ v140
+
+
+ DynamicLibrary
+ true
+ MultiByte
+ false
+ v140
+
+
+ StaticLibrary
+ false
+ true
+ MultiByte
+ v140
+
+
+ DynamicLibrary
+ false
+ true
+ MultiByte
+ v140
+
+
+ StaticLibrary
+ false
+ true
+ MultiByte
+ v140
+
+
+ DynamicLibrary
+ false
+ true
+ MultiByte
+ v140
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
+
+
+ true
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
+
+
+ true
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
+
+
+ true
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
+
+
+ false
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
+
+
+ false
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
+
+
+ false
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
+
+
+ false
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\
+ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
+
+
+
+
+
+ Level3
+ Disabled
+ SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ 4244;%(DisableSpecificWarnings)
+ MultiThreadedDebug
+ $(SolutionDir);$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+
+
+
+
+
+
+ Level3
+ Disabled
+ SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ 4244;%(DisableSpecificWarnings)
+ MultiThreadedDebugDLL
+ $(SolutionDir)..\..\;$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+
+
+
+
+
+
+ Level3
+ Disabled
+ SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ 4244;%(DisableSpecificWarnings)
+ MultiThreadedDebug
+
+
+ Console
+ true
+
+
+
+
+
+
+ Level3
+ Disabled
+ SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ 4244;%(DisableSpecificWarnings)
+ MultiThreadedDebugDLL
+
+
+ Console
+ true
+
+
+
+
+ Level3
+
+
+ Full
+ true
+ true
+ SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ 4244;%(DisableSpecificWarnings)
+ MultiThreaded
+ Speed
+ $(SolutionDir);$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+ Level3
+
+
+ Full
+ true
+ true
+ SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ 4244;%(DisableSpecificWarnings)
+ MultiThreadedDLL
+ Speed
+ $(SolutionDir);$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ 4244;%(DisableSpecificWarnings)
+ MultiThreaded
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ 4244;%(DisableSpecificWarnings)
+ MultiThreadedDLL
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ci/appveyor/libsodium.vcxproj.filters b/ci/appveyor/libsodium.vcxproj.filters
new file mode 100644
index 00000000..56ef3cdc
--- /dev/null
+++ b/ci/appveyor/libsodium.vcxproj.filters
@@ -0,0 +1,816 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
diff --git a/msvc-scripts/process.bat b/ci/appveyor/msvc-scripts/process.bat
similarity index 59%
rename from msvc-scripts/process.bat
rename to ci/appveyor/msvc-scripts/process.bat
index bf8ad4a2..963d7515 100755
--- a/msvc-scripts/process.bat
+++ b/ci/appveyor/msvc-scripts/process.bat
@@ -1,5 +1,5 @@
-cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.20/ < src\libsodium\include\sodium\version.h.in > tmp
+cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.20/ < ..\..\src\libsodium\include\sodium\version.h.in > tmp
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/28/ < tmp > tmp2
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/0/ < tmp2 > tmp3
-cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > src\libsodium\include\sodium\version.h
+cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > ..\..\src\libsodium\include\sodium\version.h
del tmp tmp2 tmp3
diff --git a/msvc-scripts/rep.vbs b/ci/appveyor/msvc-scripts/rep.vbs
similarity index 100%
rename from msvc-scripts/rep.vbs
rename to ci/appveyor/msvc-scripts/rep.vbs
diff --git a/msvc-scripts/sodium.props b/ci/appveyor/msvc-scripts/sodium.props
similarity index 70%
rename from msvc-scripts/sodium.props
rename to ci/appveyor/msvc-scripts/sodium.props
index 41e1e471..b5665f68 100644
--- a/msvc-scripts/sodium.props
+++ b/ci/appveyor/msvc-scripts/sodium.props
@@ -1,24 +1,25 @@
-
+
- $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)
+ $(SolutionDir);$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
true
UNICODE;_UNICODE;%(PreprocessorDefinitions)
NATIVE_LITTLE_ENDIAN=1;%(PreprocessorDefinitions)
inline=__inline;%(PreprocessorDefinitions)
- "$(SolutionDir)/msvc-scripts/process.bat"
+ "$(SolutionDir)\msvc-scripts\process.bat"
Process .in files
- "$(SolutionDir)/test/default/wintest.bat" $(Configuration) $(Platform)
+ "$(SolutionDir)..\..\test\default\wintest.bat" $(Configuration) $(Platform)
Run the test suite
diff --git a/configure.ac b/configure.ac
index 88a35c66..e11a27ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -947,7 +947,6 @@ AC_CONFIG_FILES([Makefile
dist-build/Makefile
libsodium.pc
libsodium-uninstalled.pc
- msvc-scripts/Makefile
src/Makefile
src/libsodium/Makefile
src/libsodium/include/Makefile
diff --git a/libsodium.vcxproj b/libsodium.vcxproj
deleted file mode 100644
index 33e98531..00000000
--- a/libsodium.vcxproj
+++ /dev/null
@@ -1,595 +0,0 @@
-
-
-
-
- DebugDLL
- Win32
-
-
- DebugDLL
- x64
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- ReleaseDLL
- Win32
-
-
- ReleaseDLL
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {A185B162-6CB6-4502-B03F-B56F7699A8D9}
- Win32Proj
- libsodium
-
-
-
- StaticLibrary
- true
- MultiByte
- false
- v140
-
-
- DynamicLibrary
- true
- MultiByte
- false
- v140
-
-
- StaticLibrary
- true
- MultiByte
- false
- v140
-
-
- DynamicLibrary
- true
- MultiByte
- false
- v140
-
-
- StaticLibrary
- false
- true
- MultiByte
- v140
-
-
- DynamicLibrary
- false
- true
- MultiByte
- v140
-
-
- StaticLibrary
- false
- true
- MultiByte
- v140
-
-
- DynamicLibrary
- false
- true
- MultiByte
- v140
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- $(SolutionDir)Build\$(Configuration)\$(Platform)\
- $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
-
-
- true
- $(SolutionDir)Build\$(Configuration)\$(Platform)\
- $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
-
-
- true
- $(SolutionDir)Build\$(Configuration)\$(Platform)\
- $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
-
-
- true
- $(SolutionDir)Build\$(Configuration)\$(Platform)\
- $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
-
-
- false
- $(SolutionDir)Build\$(Configuration)\$(Platform)\
- $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
-
-
- false
- $(SolutionDir)Build\$(Configuration)\$(Platform)\
- $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
-
-
- false
- $(SolutionDir)Build\$(Configuration)\$(Platform)\
- $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
-
-
- false
- $(SolutionDir)Build\$(Configuration)\$(Platform)\
- $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\
-
-
-
-
-
- Level3
- Disabled
- SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- 4244;%(DisableSpecificWarnings)
- MultiThreadedDebug
- $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)
-
-
- Console
- true
-
-
-
-
-
-
- Level3
- Disabled
- SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- 4244;%(DisableSpecificWarnings)
- MultiThreadedDebugDLL
- $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)
-
-
- Console
- true
-
-
-
-
-
-
- Level3
- Disabled
- SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- 4244;%(DisableSpecificWarnings)
- MultiThreadedDebug
-
-
- Console
- true
-
-
-
-
-
-
- Level3
- Disabled
- SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- 4244;%(DisableSpecificWarnings)
- MultiThreadedDebugDLL
-
-
- Console
- true
-
-
-
-
- Level3
-
-
- Full
- true
- true
- SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- 4244;%(DisableSpecificWarnings)
- MultiThreaded
- Speed
- $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)
-
-
- Console
- true
- true
- true
-
-
-
-
- Level3
-
-
- Full
- true
- true
- SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- 4244;%(DisableSpecificWarnings)
- MultiThreadedDLL
- Speed
- $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)
-
-
- Console
- true
- true
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- 4244;%(DisableSpecificWarnings)
- MultiThreaded
-
-
- Console
- true
- true
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- 4244;%(DisableSpecificWarnings)
- MultiThreadedDLL
-
-
- Console
- true
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters
deleted file mode 100644
index 79645076..00000000
--- a/libsodium.vcxproj.filters
+++ /dev/null
@@ -1,816 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
-
diff --git a/msvc-scripts/Makefile.am b/msvc-scripts/Makefile.am
deleted file mode 100644
index 16481929..00000000
--- a/msvc-scripts/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_DIST = \
- process.bat \
- rep.vbs \
- sodium.props
diff --git a/regen-msvc/regen-msvc.py b/regen-msvc/regen-msvc.py
index 6f6de0c7..f04e3e23 100755
--- a/regen-msvc/regen-msvc.py
+++ b/regen-msvc/regen-msvc.py
@@ -9,24 +9,24 @@ dirs = set()
tlv1 = ""
for file in glob.iglob("src/libsodium/**/*.c", recursive=True):
file = file.replace("/", "\\")
- tlv1 = tlv1 + ' \r\n'.format(file)
+ tlv1 = tlv1 + ' \r\n'.format(file)
tlv2 = ""
for file in glob.iglob("src/libsodium/**/*.h", recursive=True):
file = file.replace("/", "\\")
- tlv2 = tlv2 + ' \r\n'.format(file)
+ tlv2 = tlv2 + ' \r\n'.format(file)
tlf1 = ""
for file in glob.iglob("src/libsodium/**/*.c", recursive=True):
file = file.replace("/", "\\")
- tlf1 = tlf1 + ' \r\n'.format(file)
+ tlf1 = tlf1 + ' \r\n'.format(file)
tlf1 = tlf1 + " Source Files\r\n"
tlf1 = tlf1 + " \r\n"
tlf2 = ""
for file in glob.iglob("src/libsodium/**/*.h", recursive=True):
file = file.replace("/", "\\")
- tlf2 = tlf2 + ' \r\n'.format(file)
+ tlf2 = tlf2 + ' \r\n'.format(file)
tlf2 = tlf2 + " Header Files\r\n"
tlf2 = tlf2 + " \r\n"
@@ -138,12 +138,14 @@ sbox = {
sd = os.path.dirname(os.path.realpath(__file__))
apply_template(
- sd + "/tl_libsodium.vcxproj.filters.tpl", "libsodium.vcxproj.filters", sbox
+ sd + "/tl_libsodium.vcxproj.filters.tpl",
+ "ci/appveyor/libsodium.vcxproj.filters",
+ sbox,
)
sbox.update({"platform": "v140"})
sbox.update({"configurations": get_project_configurations(140)})
-apply_template(sd + "/tl_libsodium.vcxproj.tpl", "libsodium.vcxproj", sbox)
+apply_template(sd + "/tl_libsodium.vcxproj.tpl", "ci/appveyor/libsodium.vcxproj", sbox)
apply_template(
sd + "/libsodium.vcxproj.filters.tpl",
diff --git a/regen-msvc/tl_libsodium.vcxproj.tpl b/regen-msvc/tl_libsodium.vcxproj.tpl
index eace2798..b42408eb 100644
--- a/regen-msvc/tl_libsodium.vcxproj.tpl
+++ b/regen-msvc/tl_libsodium.vcxproj.tpl
@@ -182,7 +182,7 @@
SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
4244;%(DisableSpecificWarnings)
MultiThreadedDebug
- $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)
+ $(SolutionDir);$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
Console
@@ -198,7 +198,7 @@
SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
4244;%(DisableSpecificWarnings)
MultiThreadedDebugDLL
- $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)
+ $(SolutionDir)..\..\;$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
Console
@@ -247,7 +247,7 @@
4244;%(DisableSpecificWarnings)
MultiThreaded
Speed
- $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)
+ $(SolutionDir);$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
Console
@@ -268,7 +268,7 @@
4244;%(DisableSpecificWarnings)
MultiThreadedDLL
Speed
- $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)
+ $(SolutionDir);$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include\sodium;$(SolutionDir)..\..\src\libsodium\include;%(AdditionalIncludeDirectories)
Console
@@ -320,10 +320,10 @@
{{tlv2}}
-
+
-
+