Merge branch 'dae-like-boost' into 'master'

Fix Collada loading on Windows Closes #8017 See merge request OpenMW/openmw!4161
OpenMW · Jun 10, 2024 · 820ef7a · 820ef7a
2 parents 3ef4180 + 66227f3
commit 820ef7a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
@@ -875,9 +875,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_system-vc141-mt-gd-1_63,collada-dom2.4-dp-vc141-mt-d}.dll
+				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
 			else
-				add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_system-vc141-mt-1_63,collada-dom2.4-dp-vc141-mt}.dll
+				add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-gd-1_63,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