diff --git a/platform/win32/libcurl.vcxproj b/platform/win32/libcurl.vcxproj index ce29ec1450..aca8557c1e 100644 --- a/platform/win32/libcurl.vcxproj +++ b/platform/win32/libcurl.vcxproj @@ -259,7 +259,6 @@ - @@ -382,6 +381,7 @@ + @@ -510,7 +510,6 @@ - @@ -620,6 +619,7 @@ + @@ -1027,6 +1027,7 @@ + @@ -1193,6 +1194,7 @@ + diff --git a/platform/win32/libcurl.vcxproj.filters b/platform/win32/libcurl.vcxproj.filters index 91c87e3dcb..1cf073ca55 100644 --- a/platform/win32/libcurl.vcxproj.filters +++ b/platform/win32/libcurl.vcxproj.filters @@ -270,9 +270,6 @@ Source Files\lib - - Source Files\lib - Source Files\lib @@ -639,6 +636,9 @@ Source Files\lib\vquic + + Source Files\lib\vssh + Source Files\lib\vssh @@ -1023,9 +1023,6 @@ Header Files\lib - - Header Files\lib - Header Files\lib @@ -1353,6 +1350,9 @@ Header Files\lib\vquic + + Header Files\lib\vssh + Header Files\lib\vssh @@ -2574,6 +2574,9 @@ Misc Files\docs\cmdline-opts + + Misc Files\docs\cmdline-opts + Misc Files\docs\cmdline-opts @@ -3072,6 +3075,9 @@ Misc Files\docs\libcurl\opts + + Misc Files\docs\libcurl\opts + Misc Files\docs\libcurl\opts diff --git a/platform/win32/libcurl_examples.vcxproj b/platform/win32/libcurl_examples.vcxproj index e24bdca550..50e490cba0 100644 --- a/platform/win32/libcurl_examples.vcxproj +++ b/platform/win32/libcurl_examples.vcxproj @@ -1118,6 +1118,7 @@ + @@ -1290,6 +1291,7 @@ + @@ -2159,6 +2161,7 @@ + @@ -2359,6 +2362,7 @@ + @@ -3339,6 +3343,10 @@ + + + + @@ -3561,6 +3569,8 @@ + + diff --git a/platform/win32/libcurl_examples.vcxproj.filters b/platform/win32/libcurl_examples.vcxproj.filters index 3e1fdcaa54..d3b8802fea 100644 --- a/platform/win32/libcurl_examples.vcxproj.filters +++ b/platform/win32/libcurl_examples.vcxproj.filters @@ -2898,6 +2898,9 @@ Misc Files\docs\cmdline-opts + + Misc Files\docs\cmdline-opts + Misc Files\docs\cmdline-opts @@ -3414,6 +3417,9 @@ Misc Files\docs\libcurl\opts + + Misc Files\docs\libcurl\opts + Misc Files\docs\libcurl\opts @@ -6021,6 +6027,9 @@ Misc Files\tests\data + + Misc Files\tests\data + Misc Files\tests\data @@ -6621,6 +6630,9 @@ Misc Files\tests\data + + Misc Files\tests\data + Misc Files\tests\data @@ -9561,6 +9573,18 @@ Misc Files\tests\data + + Misc Files\tests\data + + + Misc Files\tests\data + + + Misc Files\tests\data + + + Misc Files\tests\data + Misc Files\tests\data @@ -10227,6 +10251,12 @@ Misc Files\tests\data + + Misc Files\tests\data + + + Misc Files\tests\data + Misc Files\tests diff --git a/platform/win32/libwyhash.vcxproj b/platform/win32/libwyhash.vcxproj index 7df91442e2..fd329bdef0 100644 --- a/platform/win32/libwyhash.vcxproj +++ b/platform/win32/libwyhash.vcxproj @@ -50,20 +50,20 @@ false - + - + - + - + - + @@ -76,7 +76,7 @@ true false - + Custom EnableFastChecks @@ -110,8 +110,8 @@ true /bigobj /utf-8 /Zc:__cplusplus /Zc:preprocessor %(AdditionalOptions) - - + + BUILD_MONOLITHIC;BUILDING_LIBWYHASH;WYHASH_STATICLIB;%(PreprocessorDefinitions) true @@ -123,7 +123,7 @@ Default MaxSpeed Default - ../../include/system-override;.;%(AdditionalIncludeDirectories) + ../../include/system-override;.;../../thirdparty/owemdjee/plf_nanotimer;../../thirdparty/owemdjee/abseil-cpp;%(AdditionalIncludeDirectories) BUILD_MONOLITHIC;BUILDING_LIBWYHASH;WYHASH_STATICLIB;%(PreprocessorDefinitions) MultiThreadedDLL @@ -149,7 +149,7 @@ Custom - ../../include/system-override;.;%(AdditionalIncludeDirectories) + ../../include/system-override;.;../../thirdparty/owemdjee/plf_nanotimer;../../thirdparty/owemdjee/abseil-cpp;%(AdditionalIncludeDirectories) BUILD_MONOLITHIC;BUILDING_LIBWYHASH;WYHASH_STATICLIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -178,7 +178,7 @@ Default MaxSpeed Default - ../../include/system-override;.;%(AdditionalIncludeDirectories) + ../../include/system-override;.;../../thirdparty/owemdjee/plf_nanotimer;../../thirdparty/owemdjee/abseil-cpp;%(AdditionalIncludeDirectories) BUILD_MONOLITHIC;BUILDING_LIBWYHASH;WYHASH_STATICLIB;%(PreprocessorDefinitions) MultiThreadedDLL @@ -204,7 +204,7 @@ Custom - ../../include/system-override;.;%(AdditionalIncludeDirectories) + ../../include/system-override;.;../../thirdparty/owemdjee/plf_nanotimer;../../thirdparty/owemdjee/abseil-cpp;%(AdditionalIncludeDirectories) BUILD_MONOLITHIC;BUILDING_LIBWYHASH;WYHASH_STATICLIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -226,6 +226,7 @@ + @@ -248,8 +249,7 @@ - + - - \ No newline at end of file + \ No newline at end of file diff --git a/platform/win32/libwyhash.vcxproj.filters b/platform/win32/libwyhash.vcxproj.filters index 4bcd80727e..4094d2924a 100644 --- a/platform/win32/libwyhash.vcxproj.filters +++ b/platform/win32/libwyhash.vcxproj.filters @@ -20,6 +20,9 @@ Source Files + + Source Files + Source Files diff --git a/platform/win32/m-single-5.sln b/platform/win32/m-single-5.sln index baaef274bc..036a2000f2 100644 --- a/platform/win32/m-single-5.sln +++ b/platform/win32/m-single-5.sln @@ -769,8 +769,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "owemdjee", "owemdjee", "{CA ..\..\thirdparty\owemdjee\update-README.js = ..\..\thirdparty\owemdjee\update-README.js EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NTFS ADS Viewer", "..\..\..\thirdparty\DirScanner\NTFS ADS Viewer\NTFS ADS Viewer.vcxproj", "{28E9E026-5E87-4248-BA0B-07813DCD8DB1}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "__build_target_mupdf", "__build_target_mupdf.vcxproj", "{0688FE97-E8B4-4D80-8B8B-D445B349A82D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "__build_target_tesseract", "__build_target_tesseract.vcxproj", "{A60D8644-5A1C-4D29-8970-101000000002}" @@ -5242,7 +5240,3 @@ Global SolutionGuid = {29CDFD7B-83F9-4400-9DFF-FBAAF61C6584} EndGlobalSection EndGlobal - -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NTFS ADS Viewer", "..\..\..\thirdparty\DirScanner\NTFS ADS Viewer\NTFS ADS Viewer.vcxproj", "{28E9E026-5E87-4248-BA0B-07813DCD8DB1}" -EndProject - \ No newline at end of file diff --git a/platform/win32/m-single.sln b/platform/win32/m-single.sln index b9d4f4e9f2..5389b98461 100644 --- a/platform/win32/m-single.sln +++ b/platform/win32/m-single.sln @@ -769,8 +769,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "owemdjee", "owemdjee", "{CA ..\..\thirdparty\owemdjee\update-README.js = ..\..\thirdparty\owemdjee\update-README.js EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NTFS ADS Viewer", "..\..\..\thirdparty\DirScanner\NTFS ADS Viewer\NTFS ADS Viewer.vcxproj", "{28E9E026-5E87-4248-BA0B-07813DCD8DB1}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "__build_target", "__build_target.vcxproj", "{F00868E8-0DBC-4C6B-B31A-EF1330CB4D91}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "__build_target-bundle", "__build_target-bundle.vcxproj", "{6914B72A-C1F9-4A30-8994-B1AF51CBABAF}" @@ -14070,7 +14068,3 @@ Global libmupdf_CarvedSubset.vcxitems*{0fdc74d7-d18c-45ce-94d6-c5a0edfccdf2}*SharedItemsImports = 4 EndGlobalSection EndGlobal - -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NTFS ADS Viewer", "..\..\..\thirdparty\DirScanner\NTFS ADS Viewer\NTFS ADS Viewer.vcxproj", "{28E9E026-5E87-4248-BA0B-07813DCD8DB1}" -EndProject - \ No newline at end of file diff --git a/thirdparty/curl b/thirdparty/curl index b45f3f7538..d48c2131f4 160000 --- a/thirdparty/curl +++ b/thirdparty/curl @@ -1 +1 @@ -Subproject commit b45f3f7538753c9fbcd6b60553692504f6cae80c +Subproject commit d48c2131f4ade35d53d7b045adee766bcbe82364 diff --git a/thirdparty/owemdjee b/thirdparty/owemdjee index a14eabe6ba..ac0e6f2854 160000 --- a/thirdparty/owemdjee +++ b/thirdparty/owemdjee @@ -1 +1 @@ -Subproject commit a14eabe6ba3ce186c7f030179b225614de8a1102 +Subproject commit ac0e6f2854950d1fdf933207f5ab7317d3ba942a