mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2024-12-25 18:15:00 +00:00
Don't install boost-filesystem anymore
This commit is contained in:
parent
957318d0b9
commit
8e3576022a
@ -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
|
||||
|
@ -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
|
||||
|
@ -452,7 +452,7 @@ if(HAVE_MULTIVIEW)
|
||||
add_definitions(-DOSG_HAS_MULTIVIEW)
|
||||
endif(HAVE_MULTIVIEW)
|
||||
|
||||
set(BOOST_COMPONENTS system filesystem program_options iostreams)
|
||||
set(BOOST_COMPONENTS system program_options iostreams)
|
||||
if(WIN32)
|
||||
set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
|
||||
if(MSVC)
|
||||
|
@ -11,7 +11,7 @@ RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends git build-essential cmake \
|
||||
libopenal-dev libopenscenegraph-dev libbullet-dev libsdl2-dev \
|
||||
libmygui-dev libunshield-dev liblz4-dev libtinyxml-dev libqt5opengl5-dev \
|
||||
libboost-filesystem-dev libboost-program-options-dev libboost-iostreams-dev \
|
||||
libboost-program-options-dev libboost-iostreams-dev \
|
||||
libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev \
|
||||
librecast-dev libsqlite3-dev libluajit-5.1-dev
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user