diff --git a/Makefile.am b/Makefile.am index 9136a49d..f5e24ab6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,6 +12,7 @@ EXTRA_DIST = \ SUBDIRS = \ builds \ dist-build \ + msvc-scripts \ src \ test diff --git a/appveyor.yml b/appveyor.yml index f272ff6c..5e6bff55 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,5 +20,5 @@ init: msbuild /version build: parallel: true - project: ci/appveyor/libsodium.vcxproj - verbosity: normal + project: libsodium.vcxproj + verbosity: minimal diff --git a/builds/msvc/properties/ARM64.props b/builds/msvc/properties/ARM64.props deleted file mode 100644 index a5b8f546..00000000 --- a/builds/msvc/properties/ARM64.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - - <_PropertySheetDisplayName>ARM64 Settings - - - - - WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions) - - - ARM64;%(PreprocessorDefinitions) - - - MachineARM64 - - - /MACHINE:ARM64 %(AdditionalOptions) - - - - diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj index 9b30d2f9..d4a01ac7 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -1,6 +1,5 @@  - + {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium @@ -11,50 +10,50 @@ DebugDLL Win32 - - DebugDLL - x64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - DebugLTCG Win32 - - DebugLTCG - x64 - ReleaseLTCG Win32 + + DebugLTCG + x64 + ReleaseLTCG x64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj index 2c86c457..aab046e7 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -1,6 +1,5 @@  - + {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium @@ -11,50 +10,50 @@ DebugDLL Win32 - - DebugDLL - x64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - DebugLTCG Win32 - - DebugLTCG - x64 - ReleaseLTCG Win32 + + DebugLTCG + x64 + ReleaseLTCG x64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index d15d7e10..5c788b78 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -1,6 +1,5 @@  - + {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium @@ -11,50 +10,50 @@ DebugDLL Win32 - - DebugDLL - x64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - DebugLTCG Win32 - - DebugLTCG - x64 - ReleaseLTCG Win32 + + DebugLTCG + x64 + ReleaseLTCG x64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj index 4a4c5b20..276d773f 100644 --- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj @@ -1,6 +1,5 @@  - + {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium @@ -11,50 +10,50 @@ DebugDLL Win32 - - DebugDLL - x64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - DebugLTCG Win32 - - DebugLTCG - x64 - ReleaseLTCG Win32 + + DebugLTCG + x64 + ReleaseLTCG x64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj index cab710c3..e902b391 100644 --- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj @@ -1,6 +1,5 @@  - + {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium @@ -11,50 +10,50 @@ DebugDLL Win32 - - DebugDLL - x64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - DebugLTCG Win32 - - DebugLTCG - x64 - ReleaseLTCG Win32 + + DebugLTCG + x64 + ReleaseLTCG x64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary diff --git a/builds/msvc/vs2019/libsodium/libsodium.vcxproj b/builds/msvc/vs2019/libsodium/libsodium.vcxproj index e7205e50..5a482569 100644 --- a/builds/msvc/vs2019/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2019/libsodium/libsodium.vcxproj @@ -1,6 +1,5 @@  - + {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium @@ -11,73 +10,49 @@ DebugDLL Win32 - - DebugDLL - x64 - - - DebugDLL - ARM64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - ReleaseDLL - ARM64 - - - DebugLIB - Win32 - - - DebugLIB - x64 - - - DebugLIB - ARM64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - - - ReleaseLIB - ARM64 - DebugLTCG Win32 + + ReleaseLTCG + Win32 + DebugLTCG x64 - - DebugLTCG - ARM64 - - - ReleaseLTCG - Win32 - ReleaseLTCG x64 - - ReleaseLTCG - ARM64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 diff --git a/builds/msvc/vs2022/libsodium/libsodium.vcxproj b/builds/msvc/vs2022/libsodium/libsodium.vcxproj index 359a4936..8330666e 100644 --- a/builds/msvc/vs2022/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2022/libsodium/libsodium.vcxproj @@ -1,6 +1,5 @@  - + {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium @@ -11,73 +10,49 @@ DebugDLL Win32 - - DebugDLL - x64 - - - DebugDLL - ARM64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - ReleaseDLL - ARM64 - - - DebugLIB - Win32 - - - DebugLIB - x64 - - - DebugLIB - ARM64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - - - ReleaseLIB - ARM64 - DebugLTCG Win32 + + ReleaseLTCG + Win32 + DebugLTCG x64 - - DebugLTCG - ARM64 - - - ReleaseLTCG - Win32 - ReleaseLTCG x64 - - ReleaseLTCG - ARM64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 diff --git a/ci/appveyor/libsodium.vcxproj b/ci/appveyor/libsodium.vcxproj deleted file mode 100644 index 36f51ad6..00000000 --- a/ci/appveyor/libsodium.vcxproj +++ /dev/null @@ -1,611 +0,0 @@ - - - - - DebugDLL - Win32 - - - DebugDLL - x64 - - - ReleaseDLL - Win32 - - - ReleaseDLL - x64 - - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - - - DebugLTCG - Win32 - - - DebugLTCG - x64 - - - ReleaseLTCG - Win32 - - - ReleaseLTCG - 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 deleted file mode 100644 index 56ef3cdc..00000000 --- a/ci/appveyor/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/ci/appveyor/libsodium.vcxproj.user b/ci/appveyor/libsodium.vcxproj.user deleted file mode 100644 index 0f14913f..00000000 --- a/ci/appveyor/libsodium.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/configure.ac b/configure.ac index e11a27ae..88a35c66 100644 --- a/configure.ac +++ b/configure.ac @@ -947,6 +947,7 @@ 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/ci/appveyor/libsodium.sln b/libsodium.sln similarity index 100% rename from ci/appveyor/libsodium.sln rename to libsodium.sln diff --git a/libsodium.vcxproj b/libsodium.vcxproj new file mode 100644 index 00000000..d9be17b4 --- /dev/null +++ b/libsodium.vcxproj @@ -0,0 +1,594 @@ + + + + + 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 new file mode 100644 index 00000000..79645076 --- /dev/null +++ b/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/Makefile.am b/msvc-scripts/Makefile.am new file mode 100644 index 00000000..16481929 --- /dev/null +++ b/msvc-scripts/Makefile.am @@ -0,0 +1,4 @@ +EXTRA_DIST = \ + process.bat \ + rep.vbs \ + sodium.props diff --git a/ci/appveyor/msvc-scripts/process.bat b/msvc-scripts/process.bat similarity index 100% rename from ci/appveyor/msvc-scripts/process.bat rename to msvc-scripts/process.bat diff --git a/ci/appveyor/msvc-scripts/rep.vbs b/msvc-scripts/rep.vbs similarity index 100% rename from ci/appveyor/msvc-scripts/rep.vbs rename to msvc-scripts/rep.vbs diff --git a/ci/appveyor/msvc-scripts/sodium.props b/msvc-scripts/sodium.props similarity index 100% rename from ci/appveyor/msvc-scripts/sodium.props rename to msvc-scripts/sodium.props diff --git a/regen-msvc/libsodium.vcxproj.tpl b/regen-msvc/libsodium.vcxproj.tpl index 08a5b096..d09d933f 100644 --- a/regen-msvc/libsodium.vcxproj.tpl +++ b/regen-msvc/libsodium.vcxproj.tpl @@ -1,13 +1,59 @@  - + {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium {{platform}} - {{configurations}} + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary diff --git a/regen-msvc/regen-msvc.py b/regen-msvc/regen-msvc.py index ec4859c6..8b479d82 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" @@ -77,39 +77,6 @@ for dir in dirs: fd = fd + " \r\n" -def get_project_configurations(vs_version): - projconfig = "" - configs = [ - "DebugDLL", - "ReleaseDLL", - "DebugLIB", - "ReleaseLIB", - "DebugLTCG", - "ReleaseLTCG", - ] - platforms = ["Win32", "x64"] - # add arm64 platform only for v142+ toolchain - if vs_version >= 142: - platforms.append("ARM64") - for config in configs: - for platform in platforms: - projconfig = ( - projconfig - + ' \r\n'.format( - config, platform - ) - ) - projconfig = ( - projconfig - + " {}\r\n".format(config) - ) - projconfig = projconfig + " {}\r\n".format( - platform - ) - projconfig = projconfig + " \r\n" - return projconfig - - def apply_template(tplfile, outfile, sbox): tpl = "" with open(tplfile, "rb") as fd: @@ -138,14 +105,11 @@ sbox = { sd = os.path.dirname(os.path.realpath(__file__)) apply_template( - sd + "/tl_libsodium.vcxproj.filters.tpl", - "ci/appveyor/libsodium.vcxproj.filters", - sbox, + sd + "/tl_libsodium.vcxproj.filters.tpl", "libsodium.vcxproj.filters", sbox ) sbox.update({"platform": "v140"}) -sbox.update({"configurations": get_project_configurations(140)}) -apply_template(sd + "/tl_libsodium.vcxproj.tpl", "ci/appveyor/libsodium.vcxproj", sbox) +apply_template(sd + "/tl_libsodium.vcxproj.tpl", "libsodium.vcxproj", sbox) apply_template( sd + "/libsodium.vcxproj.filters.tpl", @@ -184,7 +148,6 @@ apply_template( ) sbox.update({"platform": "v143"}) -sbox.update({"configurations": get_project_configurations(143)}) apply_template( sd + "/libsodium.vcxproj.tpl", "builds/msvc/vs2022/libsodium/libsodium.vcxproj", @@ -192,7 +155,6 @@ apply_template( ) sbox.update({"platform": "v142"}) -sbox.update({"configurations": get_project_configurations(142)}) apply_template( sd + "/libsodium.vcxproj.tpl", "builds/msvc/vs2019/libsodium/libsodium.vcxproj", @@ -200,7 +162,6 @@ apply_template( ) sbox.update({"platform": "v141"}) -sbox.update({"configurations": get_project_configurations(141)}) apply_template( sd + "/libsodium.vcxproj.tpl", "builds/msvc/vs2017/libsodium/libsodium.vcxproj", @@ -208,7 +169,6 @@ apply_template( ) sbox.update({"platform": "v140"}) -sbox.update({"configurations": get_project_configurations(140)}) apply_template( sd + "/libsodium.vcxproj.tpl", "builds/msvc/vs2015/libsodium/libsodium.vcxproj", @@ -216,7 +176,6 @@ apply_template( ) sbox.update({"platform": "v120"}) -sbox.update({"configurations": get_project_configurations(120)}) apply_template( sd + "/libsodium.vcxproj.tpl", "builds/msvc/vs2013/libsodium/libsodium.vcxproj", @@ -224,7 +183,6 @@ apply_template( ) sbox.update({"platform": "v110"}) -sbox.update({"configurations": get_project_configurations(110)}) apply_template( sd + "/libsodium.vcxproj.tpl", "builds/msvc/vs2012/libsodium/libsodium.vcxproj", @@ -232,7 +190,6 @@ apply_template( ) sbox.update({"platform": "v100"}) -sbox.update({"configurations": get_project_configurations(100)}) apply_template( sd + "/libsodium.vcxproj.tpl", "builds/msvc/vs2010/libsodium/libsodium.vcxproj", diff --git a/regen-msvc/tl_libsodium.vcxproj.tpl b/regen-msvc/tl_libsodium.vcxproj.tpl index 57fb92bd..72bb16a8 100644 --- a/regen-msvc/tl_libsodium.vcxproj.tpl +++ b/regen-msvc/tl_libsodium.vcxproj.tpl @@ -1,8 +1,38 @@  - + - {{configurations}} + + DebugDLL + Win32 + + + DebugDLL + x64 + + + Debug + Win32 + + + Debug + x64 + + + ReleaseDLL + Win32 + + + ReleaseDLL + x64 + + + Release + Win32 + + + Release + x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9} @@ -10,7 +40,7 @@ libsodium - + StaticLibrary true MultiByte @@ -24,7 +54,7 @@ false {{platform}} - + StaticLibrary true MultiByte @@ -38,7 +68,7 @@ false {{platform}} - + StaticLibrary false true @@ -52,7 +82,7 @@ MultiByte {{platform}} - + StaticLibrary false true @@ -69,7 +99,7 @@ - + @@ -77,7 +107,7 @@ - + @@ -85,7 +115,7 @@ - + @@ -93,7 +123,7 @@ - + @@ -102,7 +132,7 @@ - + true $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ @@ -112,7 +142,7 @@ $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - + true $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ @@ -122,7 +152,7 @@ $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - + false $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ @@ -132,7 +162,7 @@ $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - + false $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ @@ -142,7 +172,7 @@ $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - + @@ -174,7 +204,7 @@ true - + @@ -204,7 +234,7 @@ true - + Level3 @@ -246,7 +276,7 @@ true - + Level3