From 5d19e5446e8b1b3407dafe8ada4b4dfa213764cb Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 8 Dec 2021 19:46:46 +0000 Subject: [PATCH] Update Shared libraries (buildfiles) --- Shared-libraries-(buildfiles).md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Shared-libraries-(buildfiles).md b/Shared-libraries-(buildfiles).md index 56ecde4..29a4e39 100644 --- a/Shared-libraries-(buildfiles).md +++ b/Shared-libraries-(buildfiles).md @@ -12,12 +12,20 @@ TODO: macOS libcurl is used for downloading *.pk3 files from servers ### Windows -Darkplaces loads `libcurl-4.dll` or `libcurl-3.dll` -Build instructions: -* clone https://gitlab.com/incognico/build-libcurl-windows -* run `build.bat` in a VS2019 Development Shell -* rename the built dlls (x64 & x86) to `libcurl-4.dll` +``` +git clone -b curl-7_80_0 https://github.com/curl/curl || true +curl -o x86_64-w64-mingw32.cmake https://raw.githubusercontent.com/zyga/cmake-toolchains/master/Toolchain-Ubuntu-mingw64.cmake +d0=$(pwd) +rm -rf build +mkdir build +cd build +cmake -DCMAKE_TOOLCHAIN_FILE="$d0/x86_64-w64-mingw32.cmake" -DCMAKE_INSTALL_PREFIX="$d0/out" "$d0/curl" +make +make install +cd "$d0" +cp out/bin/libcurl.dll ~/Games/xonotic/misc/buildfiles/win64/libcurl-4.dll +``` ### macOS Darkplaces loads `libcurl.4.dylib` or `libcurl.3.dylib` or `libcurl.2.dylib` @@ -28,7 +36,6 @@ libjpeg-turbo is needed to display jpeg images/textures ### Windows ``` -set -ex git clone https://github.com/libjpeg-turbo/libjpeg-turbo.git || true curl -o x86_64-w64-mingw32.cmake https://raw.githubusercontent.com/zyga/cmake-toolchains/master/Toolchain-Ubuntu-mingw64.cmake d0=$(pwd) -- 2.39.2