highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  configure: Avoid requiring c99wrap for working around msys path issues

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-21 12:07:29 +01:00
commit 8c9df116cd
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure vendored
View File

@ -2626,29 +2626,33 @@ case "$toolchain" in
msvc) msvc)
# Check whether the current MSVC version needs the C99 converter. # Check whether the current MSVC version needs the C99 converter.
# From MSVC 2013 (compiler major version 18) onwards, it does actually # From MSVC 2013 (compiler major version 18) onwards, it does actually
# support enough of C99 to build ffmpeg, but we still need to use # support enough of C99 to build ffmpeg. Default to the new
# c99wrap for passing command line parameters with a space (for
# avoiding msys path mangling/conversion issues). Default to the new
# behaviour if the regexp was unable to match anything, since this # behaviour if the regexp was unable to match anything, since this
# successfully parses the version number of existing supported # successfully parses the version number of existing supported
# versions that require the converter (MSVC 2010 and 2012). # versions that require the converter (MSVC 2010 and 2012).
cl_major_ver=$(cl 2>&1 | sed -n 's/.*Version \([[:digit:]]\{1,\}\)\..*/\1/p') cl_major_ver=$(cl 2>&1 | sed -n 's/.*Version \([[:digit:]]\{1,\}\)\..*/\1/p')
if [ -z "$cl_major_ver" ] || [ $cl_major_ver -ge 18 ]; then if [ -z "$cl_major_ver" ] || [ $cl_major_ver -ge 18 ]; then
cc_default="c99wrap -noconv cl" cc_default="cl"
else else
cc_default="c99wrap cl" cc_default="c99wrap cl"
fi fi
ld_default="c99wrap link" ld_default="link"
nm_default="dumpbin -symbols" nm_default="dumpbin -symbols"
ar_default="lib" ar_default="lib"
target_os_default="win32" target_os_default="win32"
# Use a relative path for TMPDIR. This makes sure all the
# ffconf temp files are written with a relative path, avoiding
# issues with msys/win32 path conversion for MSVC parameters
# such as -Fo<file> or -out:<file>.
TMPDIR=.
;; ;;
icl) icl)
cc_default="c99wrap -noconv icl" cc_default="icl"
ld_default="c99wrap xilink" ld_default="xilink"
nm_default="dumpbin -symbols" nm_default="dumpbin -symbols"
ar_default="xilib" ar_default="xilib"
target_os_default="win32" target_os_default="win32"
TMPDIR=.
;; ;;
gcov) gcov)
add_cflags -fprofile-arcs -ftest-coverage add_cflags -fprofile-arcs -ftest-coverage
@ -3013,15 +3017,13 @@ probe_cc(){
_DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs' _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
_cflags_speed="-O2" _cflags_speed="-O2"
_cflags_size="-O1" _cflags_size="-O1"
# Nonstandard output options, to avoid msys path conversion issues.
# Relies on wrapper to remap it.
if $_cc 2>&1 | grep -q Linker; then if $_cc 2>&1 | grep -q Linker; then
_ld_o='-out $@' _ld_o='-out:$@'
else else
_ld_o='-Fe$@' _ld_o='-Fe$@'
fi fi
_cc_o='-Fo $@' _cc_o='-Fo$@'
_cc_e='-P -Fi $@' _cc_e='-P -Fi$@'
_flags_filter=msvc_flags _flags_filter=msvc_flags
_ld_lib='lib%.a' _ld_lib='lib%.a'
_ld_path='-libpath:' _ld_path='-libpath:'
@ -3039,14 +3041,12 @@ probe_cc(){
# versions (tested) as well. # versions (tested) as well.
_cflags_speed="-O2" _cflags_speed="-O2"
_cflags_size="-O1 -Oi" # -O1 without -Oi miscompiles stuff _cflags_size="-O1 -Oi" # -O1 without -Oi miscompiles stuff
# Nonstandard output options, to avoid msys path conversion issues.
# Relies on wrapper to remap it.
if $_cc 2>&1 | grep -q Linker; then if $_cc 2>&1 | grep -q Linker; then
_ld_o='-out $@' _ld_o='-out:$@'
else else
_ld_o='-Fe$@' _ld_o='-Fe$@'
fi fi
_cc_o='-Fo $@' _cc_o='-Fo$@'
_cc_e='-P' _cc_e='-P'
_flags_filter=icl_flags _flags_filter=icl_flags
_ld_lib='lib%.a' _ld_lib='lib%.a'