]> git.xonotic.org Git - xonotic/xonotic.wiki.git/commitdiff
FIxing DLL names
authorz411 <electrik.persona@gmail.com>
Wed, 29 Dec 2021 00:15:16 +0000 (00:15 +0000)
committerz411 <electrik.persona@gmail.com>
Wed, 29 Dec 2021 00:15:16 +0000 (00:15 +0000)
Shared-libraries-(buildfiles).md

index 41ac9e1ae4fe2a46324eb2a4808c20a2e5aa3dde..664c21fb47b6c794c0026b25eb77c0e68c7f8fd5 100644 (file)
@@ -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