diff --git a/.gitignore b/.gitignore index 7c6c20d..0e30bd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,5 @@ target release -*.dll -!res/windows/libeay32.dll -!res/windows/libeay32md.dll -!res/windows/ssleay32md.dll *.res *.sqlite *.sqlite-journal diff --git a/appveyor.yml b/appveyor.yml index 74d5504..c3cb680 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -82,11 +82,6 @@ matrix: # For simple configurations, instead of using the build matrix, you can simply set the # default-toolchain and default-host manually here. install: - #OpenSSL install - - appveyor DownloadFile https://slproweb.com/download/Win64OpenSSL-1_1_0f.exe - - ps: Start-Process Win64OpenSSL-1_1_0f.exe -ArgumentList "/silent /verysilent /sp- /suppressmsgboxes" -Wait - - cmd: SET OPENSSL_LIB_DIR=C:\OpenSSL-Win64 - - cmd: SET OPENSSL_INCLUDE_DIR=C:\OpenSSL-Win64\include #Rust install - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe - rustup-init -yv --default-toolchain %channel% --default-host %target% diff --git a/build_release_windows.ps1 b/build_release_windows.ps1 index 52fe8cf..f5cec4d 100644 --- a/build_release_windows.ps1 +++ b/build_release_windows.ps1 @@ -12,9 +12,6 @@ Remove-Item -Recurse .\release\tmp\* "" "Copying to output directory" -Copy-Item .\res\windows\libeay32.dll .\release\tmp\ -Copy-Item .\res\windows\libeay32md.dll .\release\tmp\ -Copy-Item .\res\windows\ssleay32md.dll .\release\tmp\ Copy-Item .\res\windows\installer\license.rtf .\release\tmp\ Copy-Item .\res\windows\installer\banner.bmp .\release\tmp\ Copy-Item .\res\windows\installer\dialog.bmp .\release\tmp\ diff --git a/res/windows/installer/installer.wxs b/res/windows/installer/installer.wxs index 8062c80..9ddb40c 100644 --- a/res/windows/installer/installer.wxs +++ b/res/windows/installer/installer.wxs @@ -19,18 +19,6 @@ - - - - - - - - - - - - @@ -193,9 +181,6 @@ - - - diff --git a/res/windows/libeay32.dll b/res/windows/libeay32.dll deleted file mode 100644 index 38f3a51..0000000 Binary files a/res/windows/libeay32.dll and /dev/null differ diff --git a/res/windows/libeay32md.dll b/res/windows/libeay32md.dll deleted file mode 100644 index 38f3a51..0000000 Binary files a/res/windows/libeay32md.dll and /dev/null differ diff --git a/res/windows/ssleay32md.dll b/res/windows/ssleay32md.dll deleted file mode 100644 index 8bcf2da..0000000 Binary files a/res/windows/ssleay32md.dll and /dev/null differ