[vlc-commits] Revert "Win32: Do not ship libgcc*dll"

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Apr 16 15:47:50 2013 +0200| [d1276ce66bb69b0a67321fd746c2becde2fa1646] | committer: Rafaël Carré

Revert "Win32: Do not ship libgcc*dll"

This reverts commit dc28edcecdf204867a504e946386511689e37f90.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d1276ce66bb69b0a67321fd746c2becde2fa1646
---

 extras/package/win32/package.mak |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index de3980a..8710e6f 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -59,6 +59,16 @@ endif
 	cp "$(top_builddir)/npapi-vlc/npapi/package/npvlc.dll.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
 
+# Compiler shared DLLs, when using compilers built with --enable-shared
+# The shared DLLs may not necessarily be in the first LIBRARY_PATH, we
+# should check them all.
+	library_path_list=`$(CXX) -v /dev/null 2>&1 | grep ^LIBRARY_PATH|cut -d= -f2` ;\
+	IFS=':' ;\
+	for x in $$library_path_list ;\
+	do \
+		cp "$$x/libstdc++-6.dll" "$$x/libgcc_s_sjlj-1.dll" "$(win32_destdir)/" ; true ;\
+	done
+
 # SDK
 	mkdir -p "$(win32_destdir)/sdk/lib/"
 	cp -r $(prefix)/include "$(win32_destdir)/sdk"