Skip to content

V
vlc
Commit f305b4f1 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Distribute compiler DLLs when needed

parent e9c1058b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
Makefile.am
View file @ f305b4f1
...@@ -741,13 +741,10 @@ endif ...@@ -741,13 +741,10 @@ endif
cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
endif endif
# Compiler shared DLLs # Compiler shared DLLs, when using compilers built with --enable-shared
# For win64 only, Debian mingw32 compilers are built with --disable-shared # If gcc_s_sjlj/stdc++-6 DLLs exist, our C++ modules were linked to them
if HAVE_WIN64 gcc_lib_dir=`$(CXX) -v /dev/null 2>&1 | grep ^LIBRARY_PATH|cut -d= -f2|cut -d: -f1` ; \
# 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` ; \
cp "$${gcc_lib_dir}/libstdc++-6.dll" "$${gcc_lib_dir}/libgcc_s_sjlj-1.dll" "$(win32_destdir)/" ; true cp "$${gcc_lib_dir}/libstdc++-6.dll" "$${gcc_lib_dir}/libgcc_s_sjlj-1.dll" "$(win32_destdir)/" ; true
endif
# SDK # SDK
mkdir -p "$(win32_destdir)/sdk/lib" mkdir -p "$(win32_destdir)/sdk/lib"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment