1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-17 10:10:23 +00:00

Merge branch 'nine-ten-eleven-twelve' into 'master'

Fix extraction with 7z 9.10

See merge request OpenMW/openmw!415
This commit is contained in:
psi29a 2020-11-17 17:04:30 +00:00
commit 86dc6f7512

View File

@ -913,7 +913,7 @@ printf "LZ4 1.9.2... "
printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then
rm -rf LZ4_1.9.2
eval 7z x -y lz4_win${BITS}_v1_9_2.7z -o./LZ4_1.9.2 $STRIP
eval 7z x -y lz4_win${BITS}_v1_9_2.7z -o$(real_pwd)/LZ4_1.9.2 $STRIP
fi
export LZ4DIR="$(real_pwd)/LZ4_1.9.2"
add_cmake_opts -DLZ4_INCLUDE_DIR="${LZ4DIR}/include" \