appveyor: trying to fix build

enkore · enkore · commit 1505cb3747ec · 2024-07-09T11:43:28.000+02:00
diff --git a/ci/appveyor/build_ssh.bat b/ci/appveyor/build_ssh.bat
@@ -1,5 +1,3 @@
-IF "%PYTHON_VERSION%" == "2.7" (exit 0)
-
 mkdir src
 cd src
 
@@ -13,8 +11,8 @@ cmake ..\libssh                                    ^
       -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%
 
 
-cp %OPENSSL_DIR%\lib\VC\libcrypto%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
-cp %OPENSSL_DIR%\lib\VC\libssl%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl.lib %APPVEYOR_BUILD_FOLDER%
 
 cmake --build . --config Release
 cmake --install . --prefix ../local
diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
 _arch = platform.architecture()[0][0:2]
 _libs = ['ssh'] if not ON_WINDOWS else [
     'ssh', 'Ws2_32', 'user32',
-    'libcrypto%sMD' % _arch, 'libssl%sMD' % _arch,
+    'libcrypto', 'libssl',
     'zlibstatic',
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`_arch = platform.architecture()[0][0:2]`
`43`	`43`	`_libs = ['ssh'] if not ON_WINDOWS else [`
`44`	`44`	`'ssh', 'Ws2_32', 'user32',`
`45`		`- 'libcrypto%sMD' % _arch, 'libssl%sMD' % _arch,`
	`45`	`+ 'libcrypto', 'libssl',`
`46`	`46`	`'zlibstatic',`
`47`	`47`	`]`
`48`	`48`