diff --git a/README.md b/README.md index af90efc081..5c43a39a76 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,9 @@ 4.3.4 (master) | :------------: | -[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/The-Cataclysm-Preservation-Project/TrinityCore?branch=master&svg=true)](https://ci.appveyor.com/project/Ovahlord/trinitycore) | -[![master GCC Build status](https://github.com/The-Cataclysm-Preservation-Project/TrinityCore/actions/workflows/gcc-build.yml/badge.svg?branch=master&event=push)](https://github.com/The-Cataclysm-Preservation-Project/TrinityCore/actions?query=workflow%3AGCC+branch%3Amaster+event%3Apush) | -[![master clang Build status](https://github.com/The-Cataclysm-Preservation-Project/TrinityCore/actions/workflows/clang-build.yml/badge.svg?branch=master&event=push)](https://github.com/The-Cataclysm-Preservation-Project/TrinityCore/actions?query=workflow%3ACLANG+branch%3Amaster+event%3Apush) | +[![Build status](https://ci.appveyor.com/api/projects/status/u7b5qi208wulxd3q/branch/master?svg=true)](https://ci.appveyor.com/project/rodrigoangeloni/trinitycorecata/branch/master) | +[![master GCC Build status](https://github.com/rodrigoangeloni/TrinityCoreCata/actions/workflows/gcc-build.yml/badge.svg?branch=master&event=push)](https://github.com/rodrigoangeloni/TrinityCoreCata/actions?query=workflow%3AGCC+branch%3Amaster+event%3Apush) | +[![master clang Build status](https://github.com/rodrigoangeloni/TrinityCoreCata/actions/workflows/clang-build.yml/badge.svg?branch=master&event=push)](https://github.com/rodrigoangeloni/TrinityCoreCata/actions?query=workflow%3ACLANG+branch%3Amaster+event%3Apush) | ## Introduction @@ -29,8 +29,8 @@ website at [TrinityCore.org](https://www.trinitycore.org). ## Install Detailed installation guides are available in the [wiki](https://www.trinitycore.info/display/tc/Installation+Guide) for -Windows, Linux and Mac OSX. -You can get database from +Windows, Linux and Mac OSX. +You can get database from https://github.com/The-Cataclysm-Preservation-Project/TrinityCore/releases diff --git a/appveyor.yml b/appveyor.yml index 4afd3aa633..2d5f1c3034 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,32 +4,24 @@ clone_depth: 1 init: - ps: '' environment: - BOOST_ROOT: C:\Libraries\boost_1_83_0 - MYSQL_ROOT_DIR: C:\mysql-8.1.0-winx64 - OPENSSL_ROOT_DIR: C:\OpenSSL-v30-Win64 + BOOST_ROOT: C:\local\boost_1_78_0 + MYSQL_ROOT_DIR: C:\Program Files\MySQL\MySQL Server 8.0 + OPENSSL_ROOT_DIR: C:\OpenSSL-v32-Win64 install: -- ps: >- - Write-Host "Installing MySQL Server 8.1" -ForegroundColor Cyan - - Write-Host "Downloading MySQL..." - - $zipPath = "$($env:temp)\mysql-8.1.0-winx64.zip" - - (New-Object Net.WebClient).DownloadFile('https://cdn.mysql.com//Downloads/MySQL-8.1/mysql-8.1.0-winx64.zip', $zipPath) - - Write-Host "Unpacking..." - - 7z x $zipPath -o"C:\" | Out-Null - - Write-Host "MySQL Server 8.1 installed" -ForegroundColor Cyan - +- ps: | + Write-Host "Descargando Boost 1.78.0..." -ForegroundColor Cyan + $boostZip = "$($env:temp)\boost_1_78_0.zip" + (New-Object Net.WebClient).DownloadFile('https://archives.boost.io/release/1.78.0/source/boost_1_78_0.zip', $boostZip) + Write-Host "Descomprimiendo Boost..." -ForegroundColor Cyan + 7z x $boostZip -o"C:\local" | Out-Null + Write-Host "Boost instalado en C:\local\boost_1_78_0" -ForegroundColor Cyan build_script: - cmd: >- git config user.email "appveyor@build.bot" && git config user.name "AppVeyor" - md build && cd build + cmake -S . -B .\build -G"Visual Studio 17 2022" -A x64 -DSCRIPTS=dynamic -DWITH_WARNINGS_AS_ERRORS=ON -DTOOLS=ON - cmake -G"Visual Studio 17 2022" -A x64 -DSCRIPTS=static -DTOOLS=True -DCMAKE_CXX_FLAGS=" /DWIN32 /D_WINDOWS /W3 /GR /EHsc /WX" -DCMAKE_C_FLAGS="/DWIN32 /D_WINDOWS /W3 /WX" .. + cd build "C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" /nologo /m:2 /p:Configuration=RelWithDebInfo /p:Platform="X64" /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" "TrinityCore.sln" diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 5e6d7d38b8..4847c729aa 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -132,6 +132,14 @@ variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile, s /// Launch the Trinity server extern int main(int argc, char** argv) { +#if OPENSSL_VERSION_NUMBER >= 0x30000000L + OSSL_PROVIDER* legacy = OSSL_PROVIDER_load(nullptr, "legacy"); + if (!legacy) { + printf("ERROR: OpenSSL legacy provider could not be loaded. RC4 will not be available.\n"); + } else { + printf("OpenSSL legacy provider loaded successfully.\n"); + } +#endif Trinity::Impl::CurrentServerProcessHolder::_type = SERVER_PROCESS_WORLDSERVER; signal(SIGABRT, &Trinity::AbortHandler);