ffmpeg | branch: master | Steve Lhomme <rob...@gmail.com> | Fri Jul 24 09:38:04 2015 +0200| [58ed7b632842f3fedbe737c3945cabc56bab2f47] | committer: Michael Niedermayer
use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe favor link over link.exe in case some wrapper script already exists fallback to "link" in the path if the one next to cl is not found Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58ed7b632842f3fedbe737c3945cabc56bab2f47 --- compat/windows/mslink | 9 +++++++++ configure | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/compat/windows/mslink b/compat/windows/mslink new file mode 100755 index 0000000..07b2b3e --- /dev/null +++ b/compat/windows/mslink @@ -0,0 +1,9 @@ +#!/bin/sh + +LINK_EXE_PATH=$(dirname "$(command -v cl)")/link +if [ -x "$LINK_EXE_PATH" ]; then + "$LINK_EXE_PATH" $@ +else + link $@ +fi +exit $? diff --git a/configure b/configure index 7b8815f..7748bc7 100755 --- a/configure +++ b/configure @@ -3183,7 +3183,7 @@ case "$toolchain" in else cc_default="c99wrap cl" fi - ld_default="link" + ld_default="$source_path/compat/windows/mslink" nm_default="dumpbin -symbols" ar_default="lib" target_os_default="win32" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
