From 98be0de4e685902462c7c0f9dc1162ed0bcbe344 Mon Sep 17 00:00:00 2001 From: z411 Date: Wed, 29 Dec 2021 00:15:16 +0000 Subject: [PATCH] FIxing DLL names --- Shared-libraries-(buildfiles).md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Shared-libraries-(buildfiles).md b/Shared-libraries-(buildfiles).md index 41ac9e1..664c21f 100644 --- a/Shared-libraries-(buildfiles).md +++ b/Shared-libraries-(buildfiles).md @@ -160,10 +160,11 @@ Obtainment instructions: Cross-compiling: ``` +d0=$(pwd) OGGVER="v1.3.5" git clone -b $OGGVER https://gitlab.xiph.org/xiph/ogg.git +sed -i 's/^LIBRARY ogg$/LIBRARY libogg/' "$d0/ogg/win32/ogg.def" # Call it libogg 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 @@ -171,7 +172,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$d0/x86_64-w64-mingw32.cmake" -DBUILD_SHARED_LIBS= make make install cd "$d0" -cp out/bin/libogg.dll ~/Games/xonotic/misc/buildfiles/win64/ogg.dll +cp out/bin/libogg.dll ~/Games/xonotic/misc/buildfiles/win64/libogg.dll ``` ### macOS @@ -197,9 +198,9 @@ OGG_ROOT=$d0/../ogg/out git clone -b $VORBISVER https://gitlab.xiph.org/xiph/vorbis.git # Fix win32 def files -sed -i 's/^LIBRARY$/LIBRARY vorbis/' "$d0/vorbis/win32/vorbis.def" -sed -i 's/^LIBRARY$/LIBRARY vorbisenc/' "$d0/vorbis/win32/vorbisenc.def" -sed -i 's/^LIBRARY$/LIBRARY vorbisfile/' "$d0/vorbis/win32/vorbisfile.def" +sed -i 's/^LIBRARY$/LIBRARY libvorbis/' "$d0/vorbis/win32/vorbis.def" +sed -i 's/^LIBRARY$/LIBRARY libvorbisenc/' "$d0/vorbis/win32/vorbisenc.def" +sed -i 's/^LIBRARY$/LIBRARY libvorbisfile/' "$d0/vorbis/win32/vorbisfile.def" curl -o x86_64-w64-mingw32.cmake https://raw.githubusercontent.com/zyga/cmake-toolchains/master/Toolchain-Ubuntu-mingw64.cmake rm -rf build @@ -209,9 +210,9 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$d0/x86_64-w64-mingw32.cmake" -DBUILD_SHARED_LIBS= make make install cd "$d0" -cp out/bin/libvorbis.dll ~/Games/xonotic/misc/buildfiles/win64/vorbis.dll -cp out/bin/libvorbisfile.dll ~/Games/xonotic/misc/buildfiles/win64/vorbisfile.dll -cp out/bin/libvorbisenc.dll ~/Games/xonotic/misc/buildfiles/win64/vorbisenc.dll +cp out/bin/libvorbis.dll ~/Games/xonotic/misc/buildfiles/win64/libvorbis.dll +cp out/bin/libvorbisfile.dll ~/Games/xonotic/misc/buildfiles/win64/libvorbisfile.dll +cp out/bin/libvorbisenc.dll ~/Games/xonotic/misc/buildfiles/win64/libvorbisenc.dll ``` ### macOS -- 2.39.2