Merge 90ba931 into feba4d3

awslabs · Jan 2, 2024 · 7027a1c · 7027a1c
2 parents feba4d3 + 90ba931
commit 7027a1c
Show file tree

Hide file tree

Showing 16 changed files with 374 additions and 79 deletions.
diff --git a/.github/build_windows_openssl.bat b/.github/build_windows_openssl.bat
@@ -1,6 +1,5 @@
 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
 mkdir build
 cd build
-cmd.exe /c cmake -G "NMake Makefiles" ..
 cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE -DENABLE_AWS_SDK_IN_TESTS=OFF -DEXT_PTHREAD_INCLUDE_DIR="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/include/" -DEXT_PTHREAD_LIBRARIES="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/lib/x64/libpthreadGC2.a" ..
 nmake
diff --git a/.github/build_windows_openssl_old.bat b/.github/build_windows_openssl_old.bat
@@ -0,0 +1,6 @@
+call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+mkdir build
+cd build
+cmd.exe /c cmake -G "NMake Makefiles" ..
+cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE -DENABLE_AWS_SDK_IN_TESTS=OFF -DBUILD_LEGACY_OPENSSL_VERSION=ON -DEXT_PTHREAD_INCLUDE_DIR="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/include/" -DEXT_PTHREAD_LIBRARIES="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/lib/x64/libpthreadGC2.a" ..
+nmake