[vlc-commits] win64 packaging: distribute libstdc++-6.dll and libgcc_s_sjlj-1.dll

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Nov  5 20:04:15 2011 -0400| [ebac954fe8d642adc49c4b237f3ef322b4eeb818] | committer: Rafaël Carré

win64 packaging: distribute libstdc++-6.dll and libgcc_s_sjlj-1.dll

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

 Makefile.am |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5aeb069..850cfb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -749,6 +749,16 @@ if !HAVE_WINCE
 endif
 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, we very likely linked our C++ modules to them
+#   FIXME : tell libtool to not use -nostdlib
+#   and add -static-libgcc and -static-libstdc++ to LDFLAGS
+	gcc_lib_dir=`x86_64-w64-mingw32-gcc -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"
 	cp -r $(destdir)/include "$(win32_destdir)/sdk"