From patchwork Fri Apr 19 14:18:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 12815 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 78135449267 for ; Fri, 19 Apr 2019 17:18:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 57EEE68A9A2; Fri, 19 Apr 2019 17:18:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f181.google.com (mail-it1-f181.google.com [209.85.166.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3DBA68A942 for ; Fri, 19 Apr 2019 17:18:40 +0300 (EEST) Received: by mail-it1-f181.google.com with SMTP id u65so8447857itc.2 for ; Fri, 19 Apr 2019 07:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=LaPUkru1f4OtKRfobPFV7ObTTJV1o96mGUlgMiHyyDU=; b=dX04z3WSgr+/G6RtaC4xS8maTs0a1Rj0hxIlXIeJxURbdJxJ9Tk+MVMkv5T9DXpyA4 wkT16E/VQ371kf31YE1IrymyRm0Rk8AZz4YlUhRgnnijUBjWib5U3dDVtZqccJEVNq4x QlqYh83gak/AnIoc9NZA9dJ4zoAbZ3duaD1B5M0SezBocMWq+iqr69VngDBCF13g1Fha mlSTa/fz98HpJL9P1uIi5KJN0AuA/rR7dme0IEmJtQnFo4Xe2YqfHNg6q6C7kOvH5Kcv xo3jxk/EFi3lUHk1CO1RuaNHdGgZfiTDj2MB85yvWknu2Zc23TqcEjL1j0j5Ei4xP1U8 PAKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=LaPUkru1f4OtKRfobPFV7ObTTJV1o96mGUlgMiHyyDU=; b=JybJcDGVMq7KcpcYDc0Tu2ViD4wAVMdCqy+T47OSYQMgmXeEWAWCG1DRIFDQfL3fgd cVQNK/Tp0fEVNBsJy9sNoiKOH1djyYTHDJ65QW6ZX5GU/WCvsxQKRI4yLY8FqjRfzC5x JnAhdwqNdsdw2I60Cc0H6OV7OjtD5lsgZJq3cA5sbUVPL05/jcNE4nTR7q9VJBzRpSiW ibLvNySunysk3tenaSIp0GhBoZKEtluYWb7bX2y2YoO6GFthghnntl5WGvDXN7EJPp0E 5lY6uXvdJChhFVN3WWiqSxTs92y+hQsgsDUpyd/weAWYDaszhYIgWBoyGlLRhg+iZ7uC Pykg== X-Gm-Message-State: APjAAAVXu+WXs8h1jJS+XRhRrVrbYaDt1r2oD4TqFgjm9fCzFIIMVHq1 0zWijJpu56WFggbGcPHQ7eRyI7LwmJh0+2N6+TE+mg== X-Google-Smtp-Source: APXvYqyLjPDCdEQ5tzKLRZ9WmIIICcm+ZgcxOGWt684Bcqe1XaF0Q1uu9Ypeq90SDtN4qELWnN2e8pzes3Tr4HHdVWk= X-Received: by 2002:a05:660c:10:: with SMTP id q16mr3102583itj.149.1555683519429; Fri, 19 Apr 2019 07:18:39 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:5503:0:0:0:0:0 with HTTP; Fri, 19 Apr 2019 07:18:38 -0700 (PDT) From: Carl Eugen Hoyos Date: Fri, 19 Apr 2019 16:18:38 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]configure: Add .exe suffix to some Windows executable names X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch is necessary for msvc compilation on wsl. Please comment, Carl Eugen From 1a6921f6b1f4655a59263ba22aa9e3210143c49b Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Fri, 19 Apr 2019 16:16:19 +0200 Subject: [PATCH] configure: Add .exe suffix to some Windows executable names. Allows msvc compilation from wsl. --- compat/windows/mslink | 2 +- configure | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compat/windows/mslink b/compat/windows/mslink index 07b2b3e..6cab090 100755 --- a/compat/windows/mslink +++ b/compat/windows/mslink @@ -4,6 +4,6 @@ LINK_EXE_PATH=$(dirname "$(command -v cl)")/link if [ -x "$LINK_EXE_PATH" ]; then "$LINK_EXE_PATH" $@ else - link $@ + link.exe $@ fi exit $? diff --git a/configure b/configure index e10e2c2..55f92c6 100755 --- a/configure +++ b/configure @@ -4114,14 +4114,14 @@ case "$toolchain" in # versions that require the converter (MSVC 2010 and 2012). 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 - cc_default="cl" - cxx_default="cl" + cc_default="cl.exe" + cxx_default="cl.exe" else die "Unsupported MSVC version (2013 or newer required)" fi ld_default="$source_path/compat/windows/mslink" - nm_default="dumpbin -symbols" - ar_default="lib" + nm_default="dumpbin.exe -symbols" + ar_default="lib.exe" case "$arch" in aarch64|arm64) as_default="armasm64" -- 1.7.10.4