[vlc-commits] Distribute compiler DLLs when needed

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Nov 12 16:51:42 2011 -0500| [f305b4f1a3072bc54dbcbc15c96693ccdad0690e] | committer: Rafaël Carré

Distribute compiler DLLs when needed

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

 Makefile.am |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5689d44..ba3209f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -741,13 +741,10 @@ endif
 	cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
 endif
 
-# Compiler shared DLLs
-# For win64 only, Debian mingw32 compilers are built with --disable-shared
-if HAVE_WIN64
-#   if gcc_s_sjlj/stdc++ DLLs exist, our C++ modules were linked to them
-	gcc_lib_dir=`x86_64-w64-mingw32-gcc -v /dev/null 2>&1 | grep ^LIBRARY_PATH|cut -d= -f2|cut -d: -f1` ; \
+# Compiler shared DLLs, when using compilers built with --enable-shared
+# If gcc_s_sjlj/stdc++-6 DLLs exist, our C++ modules were linked to them
+	gcc_lib_dir=`$(CXX) -v /dev/null 2>&1 | grep ^LIBRARY_PATH|cut -d= -f2|cut -d: -f1` ; \
 	cp "$${gcc_lib_dir}/libstdc++-6.dll" "$${gcc_lib_dir}/libgcc_s_sjlj-1.dll" "$(win32_destdir)/" ; true
-endif
 
 # SDK
 	mkdir -p "$(win32_destdir)/sdk/lib"