From patchwork Fri Feb 10 02:43:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ziemowit Laski X-Patchwork-Id: 40344 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1012444pzk; Thu, 9 Feb 2023 18:43:19 -0800 (PST) X-Google-Smtp-Source: AK7set8UV23jAS9Evw8d2dhOlRo0ePHlXhAfenmBtD7Q1XtlcWOEh31pmZP0Fh0x2gUkEeSC8MUB X-Received: by 2002:a17:906:fc0b:b0:8af:b7:78f4 with SMTP id ov11-20020a170906fc0b00b008af00b778f4mr7245462ejb.16.1675996999586; Thu, 09 Feb 2023 18:43:19 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 20-20020a170906101400b0088dbb061a74si3110167ejm.217.2023.02.09.18.43.18; Thu, 09 Feb 2023 18:43:19 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ziemas.net header.s=selector1 header.b=k5YEeZx9; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ziemas.net Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 80A9E689965; Fri, 10 Feb 2023 04:43:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2122.outbound.protection.outlook.com [40.107.92.122]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5173689965 for ; Fri, 10 Feb 2023 04:43:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cjwyj2W5GlmChG9x513Rp5n4rFM6s4m8nu8HSD5L5EpZUsU2LO+DEodDkcq5vaCba8YfIVTP9NzrFg4zT9ZVGWnUpRNEhGa0xkXu9fcvYA5JjV75IzjgoOWkaDmaYmw/xFzpb4bHtRageqFYyDYwAOLHNucMIMMlyIHE6uTnLQUqptzrbsl1YJoHYWgnHasCItwbdCYZVSlUaKqfaFwQH61N8vJ6h/z845zaavcwTCtMzKCagdl/iYjrhzldayVOolL6VronELutgxS58utE/+AEspSgwDeKBTLbm1Zsk26+7tYD1zS+Xcnh8eGGTM0WPNJAGShIMgHw7yEPWvrVMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZQrKZrga0bJDXDprps+Eck3bUn2uvEWNR6vo+tZfEKA=; b=RAfPu6Ker+BaqVSMb0J8Ez9sDIGStn4IKsV50pfAYB24AXemk2aqMvh1xlMfJqSARTPztdEHyDB1LThO90CWcwszwMvVmxoTi2LYo7nKvMX7H3doxfDiRTTrE7g5LLrwbsuc3ZrNFk5Ht6k85UTvzqXVrYebVCr31A2I37YSYQyIyWdHvtM+3UMQID0KOx4rTMwOU2a8t91DsS7rUGj/tm87P4SlbUQP0Rn+x+CfjSIXPzdsBsVp6nhUxipp1d7OBexUMYlfU/bYoX1M1NR1Ja8vKp/6/bW0eGxMz3Bum4ibWjw3fRINFEjEOsZHb8DYTPOAO9fhx6+CFH+127YH/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ziemas.net; dmarc=pass action=none header.from=ziemas.net; dkim=pass header.d=ziemas.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziemas.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZQrKZrga0bJDXDprps+Eck3bUn2uvEWNR6vo+tZfEKA=; b=k5YEeZx9EKg51Xp/nV8yklww76EltpSbdef8FIOp+VCUeXIsn4fLPeymPrBQdLKq6T6tw1m52/cRkVHifFN1FY1nX5WOd85Lc/L4HgwyZixFnuivK5+LRmUKpXuZansDdDBEKx0M10FJLwIfGogwx/2WkllbhIl90zdLkag0WcQ= Received: from BYAPR12MB3238.namprd12.prod.outlook.com (2603:10b6:a03:13b::20) by DM6PR12MB5023.namprd12.prod.outlook.com (2603:10b6:5:1b6::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.19; Fri, 10 Feb 2023 02:43:05 +0000 Received: from BYAPR12MB3238.namprd12.prod.outlook.com ([fe80::71d5:5754:c8a4:ff0e]) by BYAPR12MB3238.namprd12.prod.outlook.com ([fe80::71d5:5754:c8a4:ff0e%4]) with mapi id 15.20.6086.017; Fri, 10 Feb 2023 02:43:05 +0000 From: Ziemowit Laski To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] Use '-' instead of '/' for rc.exe options (take 2) Thread-Index: Adk893TVl+/1O9U3RpqisGC01fukOAAAb9SA Date: Fri, 10 Feb 2023 02:43:05 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ziemas.net; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BYAPR12MB3238:EE_|DM6PR12MB5023:EE_ x-ms-office365-filtering-correlation-id: a05452cb-8df7-4c45-c63a-08db0b108938 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: SUewm0hiySgjSkWSF2H1wWrgaVM7zvcp/JgCNbo782QMmZFHMmA4iyezecFDDXjlvsKoYFWE0Le3Kskxdv/rWGDSs/93V5nQD22YeYJfC88B7qgdXTtvw5o3Gzlha4nX44CT0CwKouo6ipinZZkcNHvxahLw8kdu99b3/dYSPfN5TyBq6GR71jwMk3/89XZfIOehiVstc+y2+U3kAFCSPl3kX3KJc2/8RJEpqTqfUwUxgnLAjc4QRKAgL+4Xh2qmhTufXS05DvdWr0DVnxXEsroYhFBloUhfjVyTpD1mAGBBuF8u+ncIFELp+sv0+uB5oCA11aIYthXtIsSV96mjDkYd0gY7guCa9eG2mHjgNmR5KrHzHeiBxLWbUrR8DoVhftp5n7hW9dDLLeRc+lq+cTQ0adMVy9mTmcP/dQtaIBmmrPcxEOZGVGtJetTpkq7bfcRziVoVAwUILxf+7MU5Kfzn11+6OwReysp+xdwy9t2JPqng0VX3oNWneuZYGO0dDyWYbZTvWg9KWtgTu2b9gMC5jiwBZdt+y/AWhqNBzcoe2IZVWN7EU+Ot82rxJR6mSGJ3dh2wPdX/rsy60gCITQRkCDFyxa1rUccEFgiICT2B6gpLK1lS3B32fhxSBzE5eiL4ByoVq+PwHUMv8VUayjJ8uByDl8LRib3kEoV02f1tmDyKSDklOiT9cOZvpwy5jEywcHYy9v1nMCzVHgfGCfCc0u1/wOI9sPVwKrCfZH4= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR12MB3238.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(346002)(376002)(39830400003)(366004)(136003)(396003)(451199018)(8936002)(2906002)(33656002)(186003)(83380400001)(66446008)(478600001)(316002)(66556008)(64756008)(66476007)(8676002)(76116006)(7696005)(6916009)(66946007)(26005)(6506007)(9686003)(52536014)(55016003)(71200400001)(41300700001)(38070700005)(5660300002)(38100700002)(86362001)(122000001)(460985005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?ERz3/xdmOomqfr6TsZ9Pi/Zya/TT?= =?utf-8?q?JS5txQXc71Shv1sGfTGF0v6wghIUXcUxkI67BxTmO9dE/SvfUm5morZWkxZurUuDr?= =?utf-8?q?Twcv3IhypkWCpMgkWXuIZoVCDy63C0750BHfpn3AG2JsCOXYwTa16UQT7Yrm4DLd9?= =?utf-8?q?aRbywJyp6oqu9S4EAEHjylJ+B8VuH+WGrR4TxpekLGQklA0l2UZG6ubrxObUEWyaA?= =?utf-8?q?GsoVdIje11IJRyiqphzOL8NBtKRYib64hEGON/YWMbWsI2rqNskuVAHRB2l/IOkFy?= =?utf-8?q?O1jBcdwNx9G5IpYrv3vKEAmrhKX3PYmY5lm5RV/I4YePSLxOBYowogivOL6stlbje?= =?utf-8?q?Ik4sZV6H99Hhd/ryhtqba5lv5HK9yIwk7pkY9lgG05e/M5/iu5oDWtd5SbgVJk4Az?= =?utf-8?q?Vpk4pWpMCd02BF9BSrOB/YgMb3ET+uKL8hSQr37S6Oa6AYYl6YG8tphGl/zc/NZCk?= =?utf-8?q?XVQyV5OVBmAfTU9PQP8W+un7L3XHl7MKuYc8apc7+9axJ6YDn/1yExGMKXiA6SXvx?= =?utf-8?q?DQtxB8/Pqz9jhZQ98vxjVZIU6mxaqCUucVpcumWc13qJCdybLeB/SltnXwprKz4ZA?= =?utf-8?q?LHgT/kCRzDVvzZT858elxZ3C8wV/oFzT1jXJ31gfz9JwdZow6O9LAQQn0KHLsytDZ?= =?utf-8?q?yPrfnG++Bzm+cE5nyMNZG5g3zzH7x3VWUEp18B/cuAYGXw5BLCC3x2t+61bdYYq7m?= =?utf-8?q?8g1//eZfGSDXRoQa8sTP6+3Uue0Owfa9CN2U900klECN/8llVi9ap3yArf00aSazH?= =?utf-8?q?cGg84jKBgZ+Z4qmrfK+odjnL5u8WADAuAN6pjHnSDkHy9xqAIozZ6A6bkTmwTFqkR?= =?utf-8?q?HgQKm5fk3JYwDRSP2QKE4jVBzgUgErlIYgCzcZpp2w5YtRTswe3Ym4B0GoPzC/zJT?= =?utf-8?q?Uy9rhr4oXoQU70X0ZPIGfRP8QAZGCrt3M/ZtbkDr4jCj6+o2fKZ6vLUMpHX3AilJa?= =?utf-8?q?0bDqnagcFuqne/J0VbyuX3jf29Et4CTkxwk6CIjsio0StsyuZ2krZdcPxzvwPIMmK?= =?utf-8?q?/SX/iThCWB7CkZtvBcOho7sTpZYaoPRwMPBd2u/RzA0F4Sk72Ytg+47ckH/jpTFjO?= =?utf-8?q?8FRNHUtVa4w6JS70nSrZng+aEczvHnhU9AR0dVNI7br2ZzE22uCkxeNj6JcItl1pf?= =?utf-8?q?K/uDwuVqvMmjcYPKtrp49NDekhLqVD04Fl/AutKZHvur+75gNbO+R2XSqTDkG1ZWl?= =?utf-8?q?ex/JKacYkzoEZtnvREEuwEQ/28b9UgCi25QWSfEIKE8scrmKe94FoPh5sNbUDh9iw?= =?utf-8?q?pWGntmBe4rGVZdmM2Z1GM6WBYqoG2PKr+MaiwJWlygHA96wmcAD5w4q7PHAJLmmqV?= =?utf-8?q?aWFaufqvz28DOQr994wgYFlc1etGVIooTbSSKiYpLfwHYNRhZU/JuawC3/MUzqhkE?= =?utf-8?q?yfxIHsjDIKY9oHeera6AUMupwL+cG1bzEJklee4uE40udeQOXfB94af9V2CoH59Ls?= =?utf-8?q?QvC51/WuFqhyaDiY824KwwFnDT/m7FgfeDJg4exNO9x6ehdPbQNOIsNI=3D?= MIME-Version: 1.0 X-OriginatorOrg: ziemas.net X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3238.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a05452cb-8df7-4c45-c63a-08db0b108938 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Feb 2023 02:43:05.2170 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 25bf35ba-6df9-4cb3-af27-d7d470d29fed X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: uSURo7PaqanblTh5bUs9JXGNHC6DZqNitvTIYS13QBUegnvgP4r/Xwz6snEjRwx0tklCGmu9if6MX1n+x/h7Yw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB5023 Subject: [FFmpeg-devel] [PATCH] Use '-' instead of '/' for rc.exe options (take 2) X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: MSoZ8z4PGJW7 Second version of my patch. Please let me know if I forgot something. --Zem =========================================================================== When building FFMPEG in the MSYS environment under Windows, one must not use forward slashes ('/') for command-line options. It appears that the MSYS shell interprets these as absolute paths and then automatically rewrites them into equivalent Windows paths. For example, the '/nologo' switch below gets rewritten to something like 'C:/Program Files/Git/nologo', and this obviously breaks the build. Thankfully, most M$ tools accept dashes ('-') as well. Signed-off-by: Ziemowit Łąski <15880281+zlaski@users.noreply.github.com> --- compat/windows/mswindres | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.39.1.windows.1 diff --git a/compat/windows/mswindres b/compat/windows/mswindres index 450525a33e..8c14c96bae 100755 --- a/compat/windows/mswindres +++ b/compat/windows/mswindres @@ -1,7 +1,7 @@ #!/bin/sh if [ "$1" = "--version" ]; then - rc.exe /? + rc.exe -? exit $? fi @@ -10,12 +10,12 @@ if [ $# -lt 2 ]; then exit 0 fi -EXTRA_OPTS="/nologo" +EXTRA_OPTS="-nologo" while [ $# -gt 2 ]; do case $1 in - -D*) EXTRA_OPTS="$EXTRA_OPTS /d$(echo $1 | sed -e "s/^..//" -e "s/ /\\\\ /g")" ;; - -I*) EXTRA_OPTS="$EXTRA_OPTS /i$(echo $1 | sed -e "s/^..//" -e "s/ /\\\\ /g")" ;; + -D*) EXTRA_OPTS="$EXTRA_OPTS -d$(echo $1 | sed -e "s/^..//" -e "s/ /\\\\ /g")" ;; + -I*) EXTRA_OPTS="$EXTRA_OPTS -i$(echo $1 | sed -e "s/^..//" -e "s/ + /\\\\ /g")" ;; -o) OPT_OUT="$2"; shift ;; esac shift @@ -29,4 +29,4 @@ else fi eval set -- $EXTRA_OPTS -rc.exe "$@" /fo "$OUT" "$IN" +rc.exe "$@" -fo "$OUT" "$IN"