Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge branch 'remove_boost_fs' into 'master'

Browse source 
Don't install boost-filesystem anymore

See merge request OpenMW/openmw!2972
This commit is contained in:
psi29a 2023-04-26 06:52:18 +00:00
commit 2e45c80ac2
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CI/before_script.msvc.sh
View file

@ -857,9 +857,9 @@ printf "${OSG_ARCHIVE_NAME}... "
"$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow,Sim}${SUFFIX}.dll
add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/icudt58.dll"
if [ $CONFIGURATION == "Debug" ]; then
add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-gd-1_63,boost_system-vc141-mt-gd-1_63,collada-dom2.4-dp-vc141-mt-d}.dll
add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_system-vc141-mt-gd-1_63,collada-dom2.4-dp-vc141-mt-d}.dll
else
add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-1_63,boost_system-vc141-mt-1_63,collada-dom2.4-dp-vc141-mt}.dll
add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_system-vc141-mt-1_63,collada-dom2.4-dp-vc141-mt}.dll
fi
fi
add_osg_dlls $CONFIGURATION "$(pwd)/OSG/bin/osgPlugins-3.6.5/osgdb_"{bmp,dae,dds,freetype,jpeg,osg,png,tga}${SUFFIX}.dll

3
CI/install_debian_deps.sh
View file

@ -29,7 +29,7 @@ declare -rA GROUPED_DEPS=(
# Common dependencies for building OpenMW.
[openmw-deps]="
libboost-filesystem-dev libboost-program-options-dev
libboost-program-options-dev
libboost-system-dev libboost-iostreams-dev
libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
@ -66,7 +66,6 @@ declare -rA GROUPED_DEPS=(
libavcodec58
libavformat58
libavutil56
libboost-filesystem1.74.0
libboost-iostreams1.74.0
libboost-program-options1.74.0
libboost-system1.74.0