From patchwork Sun Aug 7 15:12:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 37175 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1341953pzg; Sun, 7 Aug 2022 08:13:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR6S85UZBvOdIAwHd29GxUS/g1i5sOu+uU5xd4t45K+Yh2OVhCjcJM1hPJ9i4LCnTl8KS7Lh X-Received: by 2002:a17:906:8a57:b0:730:8b50:610a with SMTP id gx23-20020a1709068a5700b007308b50610amr11046757ejc.557.1659885206356; Sun, 07 Aug 2022 08:13:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659885206; cv=none; d=google.com; s=arc-20160816; b=T+0nt6Xt1lCYKIdSX9fnAsztRfFNIQsjgUCy+XPng88krWGbrfAxx7MfO6SDYeoIBL t6MWqYowvwSnLjWSvMJstA0S1PkoGaO1CR+FiWuoqHD7vo584XCToQFJJ5QNAgeP1yR+ 5mqlGgxsyuOeqVJ9Lm7CEOOPG56o6bxz0pO4hBzWJM5pJtAJvF9nprOw6SE16W27yvSa OeUKUa1SS1r/XQzfz8ZVpaqouetlfWfK0w7Z9oE9LOdys6eLdwIRFK+ynjKvQwYb0V4I PKAxCpZRlgoOWKEKVsKd2x25E3mNYhIxjEdSH2Z5FSVJftX5hcDq1+7qqA1QdrQTHgwU F3yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=DIz1mp0hZ5Yi6gcy4QMjFQBmQHU3l+q9a9kizBK6pjw=; b=z0bkscdbuu+Rkl8yUk07fn7T5ls8B4xis55szimuT96FPTWs3lLXaC/R2lYe/PFM5P MyfMtj3wZ2HdRTppgmMwuldEUpRnp3Dmygl1gNHUfKd/9QV6a1+RGkvvP53p1HxA4XF8 DekMsV/Jrg9S0prmsm5mWlYwjZvYm8A+t5jsQGeeCfQ1N8OAXKPFYJvviHpAJMh7aTXz AxgrQ9pu0QJ7v/UMF77Ko/WXt85KbvAqTWPBUFHA771He53UcwfTE5OXfI89vy2bSdUh sBIRm2/lxh5L66Vq7zG3zYvD1rr/buZ1z94+VKUFhR7ru1BilPNNZoUjs1ssBTprs7hZ JAhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=hVEeB8Ps; 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=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dd7-20020a1709069b8700b00730881cddb4si9146416ejc.454.2022.08.07.08.13.26; Sun, 07 Aug 2022 08:13:26 -0700 (PDT) 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=@rothenpieler.org header.s=mail header.b=hVEeB8Ps; 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=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE9DE68B6F2; Sun, 7 Aug 2022 18:13:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [136.243.74.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3BAA68B680 for ; Sun, 7 Aug 2022 18:12:57 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 7C30F2DD9F1; Sun, 7 Aug 2022 17:12:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1659885177; bh=COdCzOGB0XRHWHIUec4Ro1hY0c2KTpcB2IuRDnXL1g0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hVEeB8PsH4jWmWEKO0xMiv967b4Ztd7fD04X6+IOHdDCgu3EeCCFLPiti/I/Viq8g s9ePxP4cd95g/N1oVKKpJhxKN4O2HODwipfRHlVNaLa9J+Be2F96pnRimHtb6HqJ++ lvYj05G5HS1s8u8NgeMaXtPFF5iEU3XRkE4cP50hmKvHIbNBEMechU9pW0Fulqrypl OptCOVickCytaCegAMAutKLP+3M3iscZUhaapilNtPZtCN8wejL4tppBK1g1/69oPT DnrOiJyENLB7iaTDl2aLPRH0XsGS3UN3UtFeuJvJ5CKgJn3M5t79/QQmZM6aawpR6K osHnjAz5roydA== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Aug 2022 17:12:48 +0200 Message-Id: <20220807151248.15182-3-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220807151248.15182-1-timo@rothenpieler.org> References: <20220807151248.15182-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] compat: add msvc windres wrapper 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 Cc: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BIARcFPoIthW This is by no means a complete wrapper. It's only designed to fit the usecase ffmpegs build system has. --- compat/windows/mswindres | 32 ++++++++++++++++++++++++++++++++ configure | 2 ++ 2 files changed, 34 insertions(+) create mode 100755 compat/windows/mswindres diff --git a/compat/windows/mswindres b/compat/windows/mswindres new file mode 100755 index 0000000000..450525a33e --- /dev/null +++ b/compat/windows/mswindres @@ -0,0 +1,32 @@ +#!/bin/sh + +if [ "$1" = "--version" ]; then + rc.exe /? + exit $? +fi + +if [ $# -lt 2 ]; then + echo "Usage: mswindres [-I/include/path ...] [-DSOME_DEFINE ...] [-o output.o] input.rc [output.o]" >&2 + exit 0 +fi + +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")" ;; + -o) OPT_OUT="$2"; shift ;; + esac + shift +done + +IN="$1" +if [ -z "$OPT_OUT" ]; then + OUT="$2" +else + OUT="$OPT_OUT" +fi + +eval set -- $EXTRA_OPTS +rc.exe "$@" /fo "$OUT" "$IN" diff --git a/configure b/configure index 09fbe66e9b..6761d0cb32 100755 --- a/configure +++ b/configure @@ -4369,6 +4369,7 @@ case "$toolchain" in die "Unsupported MSVC version (2013 or newer required)" fi ld_default="$source_path/compat/windows/mslink" + windres_default="$source_path/compat/windows/mswindres" nm_default="dumpbin.exe -symbols" ar_default="lib.exe" case "${arch:-$arch_default}" in @@ -5619,6 +5620,7 @@ case $target_os in # Cannot build both shared and static libs with MSVC or icl. disable static fi + ! enabled small && test_cmd $windres --version && enable gnu_windres enabled x86_32 && check_ldflags -LARGEADDRESSAWARE shlibdir_default="$bindir_default" SLIBPREF=""