From 98df8bc1c3a3db757fd80de228db63f8d3880a08 Mon Sep 17 00:00:00 2001 From: kleuter Date: Fri, 14 May 2021 17:01:22 +0200 Subject: [PATCH] fixed compilation --- 5.15.2/compile_win.pl | 12 ++++-------- .../openssl-1.1.1k/build/{ => lib}/libcrypto.lib | Bin .../openssl-1.1.1k/build/{ => lib}/libssl.lib | Bin 3 files changed, 4 insertions(+), 8 deletions(-) rename 5.15.2/qtbase/openssl-1.1.1k/build/{ => lib}/libcrypto.lib (100%) rename 5.15.2/qtbase/openssl-1.1.1k/build/{ => lib}/libssl.lib (100%) diff --git a/5.15.2/compile_win.pl b/5.15.2/compile_win.pl index 09dc2a1..8ff958f 100644 --- a/5.15.2/compile_win.pl +++ b/5.15.2/compile_win.pl @@ -42,6 +42,8 @@ printLineToBat ("nmake install"); printLineToBat ("rm test\\*.exe"); printLineToBat ("rm test\\*.pdb"); printLineToBat ("rm test\\*.obj"); +printLineToBat ("del /s /f /q out32"); +printLineToBat ("del /s /f /q out32.dbg"); printLineToBat ("cd .."); # go back to qtbase printLineToBat (":OPENSSL_ALREAD_COMPILED"); @@ -60,14 +62,8 @@ printLineToBat ("..\\qtbase\\bin\\qmake"); printLineToBat ("nmake"); printLineToBat ("cd ..\\qtbase"); printLineToBat ("cd .."); # go up to qt dir -# openssl clean up -printLineToBat ("cd qtbase"); -printLineToBat ("cd $openssl_dir"); -printLineToBat ("del /s /f /q out32"); -printLineToBat ("del /s /f /q out32.dbg"); -printLineToBat ("cd .."); -printLineToBat ("cd .."); -# the rest + +# clean up printLineToBat ("del *.obj /s /f"); printLineToBat ("del *.ilk /s /f"); printLineToBat ("del *.pch /s /f"); diff --git a/5.15.2/qtbase/openssl-1.1.1k/build/libcrypto.lib b/5.15.2/qtbase/openssl-1.1.1k/build/lib/libcrypto.lib similarity index 100% rename from 5.15.2/qtbase/openssl-1.1.1k/build/libcrypto.lib rename to 5.15.2/qtbase/openssl-1.1.1k/build/lib/libcrypto.lib diff --git a/5.15.2/qtbase/openssl-1.1.1k/build/libssl.lib b/5.15.2/qtbase/openssl-1.1.1k/build/lib/libssl.lib similarity index 100% rename from 5.15.2/qtbase/openssl-1.1.1k/build/libssl.lib rename to 5.15.2/qtbase/openssl-1.1.1k/build/lib/libssl.lib