Update correct zlib building

[xonotic/xonotic.wiki.git] / Shared-libraries-(buildfiles).md

diff --git a/Shared-libraries-(buildfiles).md b/Shared-libraries-(buildfiles).md
index 746be32ce8581658b0916b8ba4a2d86286d8aafd..de1a82695f86c80b0741da15b68b8d11390ea226 100644 (file)
--- a/Shared-libraries-(buildfiles).md
+++ b/Shared-libraries-(buildfiles).md
@@ -62,24 +62,25 @@ Obtainment instructions:
 * download as MSYS2 Package [1] in x86 and x64 versions: https://packages.msys2.org/base/mingw-w64-zlib
 * use dll from `bin` folder
 
-Cross-compiling:
+Cross-compiling: ** TODO : Remove the "lib" prefix so libpng can load it properly later! **
 
 ```
 ZLIBVER="1.2.11"
 curl -L -o zlib-$ZLIBVER.tar.xz https://zlib.net/zlib-$ZLIBVER.tar.xz || true
 tar -xf zlib-$ZLIBVER.tar.xz
 rm zlib-$ZLIBVER.tar.xz
-
 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
+sed -i '/zlib PROPERTIES SUFFIX/i     set_target_properties(zlib PROPERTIES PREFIX "")' "$d0/zlib-$ZLIBVER/CMakeLists.txt" # Remove the "lib" prefix. TODO Do this through the cmake cache?
 cmake -DCMAKE_TOOLCHAIN_FILE="$d0/x86_64-w64-mingw32.cmake" -DBUILD_SHARED_LIBS=true -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_INSTALL_PREFIX="$d0/out" -G"Unix Makefiles" "$d0/zlib-$ZLIBVER"
 make
 make install
 cd "$d0"
-cp out/bin/libzlib1.dll ~/Games/xonotic/misc/buildfiles/win64/zlib1.dll
+cp out/bin/zlib1.dll ~/Games/xonotic/misc/buildfiles/win64/zlib1.dll
 ```
 
 ### macOS