mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 05:40:25 +00:00
Code Issues Releases Wiki Activity

Update CI/before_script.msvc.sh

Browse source
This commit is contained in:
psi29a 2020-10-19 21:59:44 +00:00
parent b3e27fae4c
commit c0e3f1c7ce
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CI/before_script.msvc.sh
View file

@ -573,8 +573,8 @@ if [ -z $SKIP_DOWNLOAD ]; then
# LZ4 # LZ4
download "LZ4 1.9.2" \ download "LZ4 1.9.2" \
"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/lz4_win${BITS}_v1_9_2.zip" \ "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/lz4_win${BITS}_v1_9_2.7z" \
"lz4_win${BITS}_v1_9_2.zip" "lz4_win${BITS}_v1_9_2.7z"
# Google test and mock # Google test and mock
if [ ! -z $TEST_FRAMEWORK ]; then if [ ! -z $TEST_FRAMEWORK ]; then
@ -913,13 +913,19 @@ printf "LZ4 1.9.2... "
printf "Exists. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
rm -rf LZ4-1.9.2 rm -rf LZ4-1.9.2
eval 7z x -y lz4_win${BITS}_v1_9_2.zip -o./LZ4-1.9.2 $STRIP eval 7z x -y lz4_win${BITS}_v1_9_2.7z -o./LZ4-1.9.2 $STRIP
fi fi
export LZ4DIR="$(real_pwd)/LZ4-1.9.2" export LZ4DIR="$(real_pwd)/LZ4-1.9.2"
add_cmake_opts -DLZ4_INCLUDE_DIR="${LZ4DIR}/include" \ add_cmake_opts -DLZ4_INCLUDE_DIR="${LZ4DIR}/include" \
-DLZ4_LIBRARY="${LZ4DIR}/static/liblz4.lib" -DLZ4_LIBRARY="${LZ4DIR}/lib/liblz4.lib"
for config in ${CONFIGURATIONS[@]}; do for CONFIGURATION in ${CONFIGURATIONS[@]}; do
add_runtime_dlls $config "$(pwd)/LZ4-1.9.2/dll/liblz4.dll" if [ $CONFIGURATION == "Debug" ]; then
LZ4_CONFIGURATION="Debug"
else
SUFFIX=""
LZ4_CONFIGURATION="Release"
fi
add_runtime_dlls $CONFIGURATION "$(pwd)/LZ4-1.9.2/bin/${LZ4_CONFIGURATION}/liblz4.dll"
done done
echo Done. echo Done.
} }