]> git.sesse.net Git - vlc/commitdiff
win64 packaging: distribute libstdc++-6.dll and libgcc_s_sjlj-1.dll
authorRafaël Carré <funman@videolan.org>
Sun, 6 Nov 2011 00:04:15 +0000 (20:04 -0400)
committerRafaël Carré <funman@videolan.org>
Sun, 6 Nov 2011 00:04:15 +0000 (20:04 -0400)
Makefile.am

index 5aeb06973b9d6feceb00b35f6f93105f2f3f811b..850cfb1c49fc3212931b25fab98ed24711b823d4 100644 (file)
@@ -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"