Re: [FFmpeg-devel] [PATCH v2] configure: support msvc build inside WSL

[Timo Rothenpieler <timo@rothenpieler.org>]

On 01.05.2024 17:06, Alexander Strasser via ffmpeg-devel wrote:
> On 2024-04-27 22:14 +0200, Timo Rothenpieler wrote:
>> ---
>>   configure | 7 ++++++-
>>   1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 8101b4fce6..89af5f75e7 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5036,7 +5036,12 @@ probe_cc(){
>>           else
>>               _ident=$($_cc --version 2>/dev/null | head -n1 | tr -d '\r')
>>           fi
>> -        _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
>> +        if [ -x "$(command -v wslpath)" ]; then
>> +            _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); if (!match($$0, / /)) { print $$0 } }'\'' | xargs -d\\n -n1 wslpath -u | awk '\''BEGIN { printf "%s:", "$@" }; { sub(/\r/,""); printf " %s", $$0 }; END { print "" }'\'' > $(@:.o=.d)'
>> +
>> +        else
>> +            _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
>> +        fi
>>           _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
>>           _cflags_speed="-O2"
>>           _cflags_size="-O1"
>> --
> 
> Should be good enough if it doesn't break MSVC builds outside of WSL.

Unless there for some reason is a wslpath binary on the path, that won't 
be an issue.
Will apply shortly
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".