mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 21:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Use multithreaded Bullet libraries on Windows

Browse Source
This commit is contained in:
AnyOldName3 2023-03-11 18:32:36 +00:00
parent cbd14833fd
commit 6ca9fb7e15
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CI/before_script.msvc.sh
View File

@ -377,7 +377,7 @@ case $VS_VERSION in
MYGUI_MSVC_YEAR="2019" MYGUI_MSVC_YEAR="2019"
LUA_MSVC_YEAR="2019" LUA_MSVC_YEAR="2019"
QT_MSVC_YEAR="2019" QT_MSVC_YEAR="2019"
BULLET_MSVC_YEAR="2015" BULLET_MSVC_YEAR="2019"
BOOST_VER="1.80.0" BOOST_VER="1.80.0"
BOOST_VER_URL="1_80_0" BOOST_VER_URL="1_80_0"
@ -395,7 +395,7 @@ case $VS_VERSION in
MYGUI_MSVC_YEAR="2019" MYGUI_MSVC_YEAR="2019"
LUA_MSVC_YEAR="2019" LUA_MSVC_YEAR="2019"
QT_MSVC_YEAR="2019" QT_MSVC_YEAR="2019"
BULLET_MSVC_YEAR="2015" BULLET_MSVC_YEAR="2019"
BOOST_VER="1.80.0" BOOST_VER="1.80.0"
BOOST_VER_URL="1_80_0" BOOST_VER_URL="1_80_0"
@ -596,8 +596,8 @@ if [ -z $SKIP_DOWNLOAD ]; then
# Bullet # Bullet
download "Bullet ${BULLET_VER}" \ download "Bullet ${BULLET_VER}" \
"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double.7z" \ "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt.7z" \
"Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double.7z" "Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt.7z"
# FFmpeg # FFmpeg
download "FFmpeg ${FFMPEG_VER}" \ download "FFmpeg ${FFMPEG_VER}" \
@ -742,8 +742,8 @@ printf "Bullet ${BULLET_VER}... "
printf -- "Exists. (No version checking) " printf -- "Exists. (No version checking) "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
rm -rf Bullet rm -rf Bullet
eval 7z x -y "${DEPS}/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double.7z" $STRIP eval 7z x -y "${DEPS}/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt.7z" $STRIP
mv "Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double" Bullet mv "Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt" Bullet
fi fi
add_cmake_opts -DBULLET_ROOT="$(real_pwd)/Bullet" add_cmake_opts -DBULLET_ROOT="$(real_pwd)/Bullet"
echo Done. echo Done.