RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9' 

* commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9':
  configure: force -nologo- when detecting MSVC

Conflicts:
	configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-24 00:44:58 +02:00
parent c6965f62a2 a54e720e02
commit da8b70b810
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -3650,14 +3650,14 @@ probe_cc(){
# with MSVC which enables it by default. # with MSVC which enables it by default.
_cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS -fp:precise' _cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS -fp:precise'
disable stripping disable stripping
elif $_cc 2>&1 | grep -q Microsoft; then elif $_cc -nologo- 2>&1 | grep -q Microsoft; then
_type=msvc _type=msvc
_ident=$($_cc 2>&1 | head -n1) _ident=$($_cc 2>&1 | head -n1)
_DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)' _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
_DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs' _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
_cflags_speed="-O2" _cflags_speed="-O2"
_cflags_size="-O1" _cflags_size="-O1"
if $_cc 2>&1 | grep -q Linker; then if $_cc -nologo- 2>&1 | grep -q Linker; then
_ld_o='-out:$@' _ld_o='-out:$@'
else else
_ld_o='-Fe$@' _ld_o='-Fe$@'