From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id B20944C8FE for ; Tue, 27 May 2025 02:11:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 15F7168CD9F; Tue, 27 May 2025 05:11:49 +0300 (EEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10olkn2093.outbound.protection.outlook.com [40.92.42.93]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 5F0D768CD9F for ; Tue, 27 May 2025 05:11:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ukdHAfxjFcuiF9IfovroehfY8A1r3iplvVamS5ZzL9LXJudSeLwEx4zWYEKmhdP0Rzm5F2PNoM9uNfsLeKMATvtdR94t6ZGIYZ/m3RSbuJ+HaEqZjNdh5oighyL/oFtCqg4/NSDSzqD7YuJrlhexrO/DjtwMyn+/kQsVJstLRT29FRByXm1afImUcNuu3/KJUjWlMG2nVjYthGtgBLjSLZF2LThkHhDJpXzvzv6aFBxzwK/E73p9VvsaItYHqbPsYRHS3WNEv4f8/KzwD8xLJ7Iq5hjWipEebH87UGieQE4kmbST8U3h9yoQEky8eYGeGZQ7OHvjCUlu2av9xEti4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Jud80CMeOZI8Vf981jvG9+08upta/KBYJigkoo7VcfM=; b=GFt2thInl2L4vGTE4BBmKI4QQxQRF08sXMNRcP72RXCDBWT50PhnCYeJrulV9FTfrpwAbQ88CubXLNURPv3M9RleZoN4+s79T6SAunQNvkhEz2++1fLsyVavD9Y9ajarxPOuVUhNkWEJcn1WZxrWwlgA6EU+SK55P2fCAT7BieYQKaIhxF5NH0OAGawcS4XUW1pFZfScULonPTqLuj1rVyvlL9T84hWkckIGiOLh6b2KXf7WIdwolj/lkLiOKhXyYIy8MLpzugF86afeukfXIxvcfm5F/ElvDDOhRT5stI8Q3Pr/YDno4SLwN0M99C2wscQ7b4L7he0mjDzL83O9Ig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jud80CMeOZI8Vf981jvG9+08upta/KBYJigkoo7VcfM=; b=ipJO9cwIjqt5uFIQ3LG8s0WS2sf0sggj3Tawq0JZv30yM9+LAPi9vxFlS82oXPFXHpn19BsdMFQdEoxhC8oedKe4/p4HcZmDwP8//9earKEYhkBJwAENp3dQ0/fcJ69hYSUlX9dd3hIeDKTMGXuTiRvVOnxAVSH5CGnEgYVKm/j9M1BFyjHvBw9cpuNzrMRtlt0XHgs+v/w5SIFu6986m1+o9k2gAdI5olRMa/vj9ZvV+U7elSZpe99mj1h+icd80lCaPUUEuAIN7dZEwV/65tUeODhm2yXoL+pjDaBkV9lPXWyjpIXLXiVRdyI7pxiCBB3faaBNSpA88w3UN8FPHw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by IA3P223MB1744.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:582::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8746.32; Tue, 27 May 2025 01:55:45 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::bf09:8e9:b07f:98a7]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::bf09:8e9:b07f:98a7%4]) with mapi id 15.20.8769.025; Tue, 27 May 2025 01:55:45 +0000 From: "softworkz ." To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH 4/5] ffbuild/common.mak: clean up and move fftools/resources-specific code its Makefile Thread-Index: AQHbzqd6e9yhnRVeFE+HzGul0w/ojLPltj1Q Date: Tue, 27 May 2025 01:55:45 +0000 Message-ID: References: <20250527013328.308477-1-ramiro.polla@gmail.com> <20250527013328.308477-4-ramiro.polla@gmail.com> In-Reply-To: <20250527013328.308477-4-ramiro.polla@gmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM8P223MB0365:EE_|IA3P223MB1744:EE_ x-ms-office365-filtering-correlation-id: 8ddaed0f-e7a1-4e99-56c8-08dd9cc19842 x-ms-exchange-slblob-mailprops: obhAqMD0nT+76ZruCrigLPUIQMEMZUn+N/zbv49IM2xyUgtfEY5D0iq+6aa3FmtXDnwBd5Mb3Na2MIQXGo3hsURzYEw9IVNNHQMwIGFyirVfZQtNvUlhxgMWrn5L/viNPZLK4wyH9dLyitPUqH3YvhQjcGn4TGiblHQmyV6X4U+ukWKBtY5SUoqYC3RLDQbjtki3EICzUn+bghavBD2+i/t36VMBGuESFrnHY/dSytcRLu0iFe8RgL6IlTfAU/zvcbMevM0j8jmNDOyw+dH2sIrb5M89XfgEvL2Vf/RiZWrRFAn2GX12JU6Da/2iPD9gYiR8S3z2RUonaBlt90PiVtzzcOD0wr40z04cg38XIAOkO0sA0osJdqBPBUSlxIzx0gEQmWwrETM7+Fp6fTWe5lTZ8eEVNtj3hqH6zzrY5Rk4HW8cl940rSWWC+vE+txngDMGGT05bW6Jga1ZKFRrIc8gNDv4RPc9A0M6AdFXQb4MSCbPOlScWdyfOOnLzLRbR/dNmxSK6Wqkqj8kwObOWEMmPdx2bfeHnJnNNqpL/r4bYOMGzGrF8evYvVUFsdvk3f9XoYnscVWC7zkn35ORJloR+uszJA0773rAKkLiGsb/NPj+O8djZrJrfGp2YH70lYyqvaaA1m6ejJY6AZ22IENih1AKVOTUhVfzeoVcnJM0ltg6SfYYewVzAMjt9xbuZzDbPfMsGnSEP2ZMKCkPgs9nFrVMQNq/SYzcOSk5j9/j81lGzOpCQM+B3Eq2S8ISP9/DrNs+9as1aI5gAkKS5ityDoQxk0Bmpi4RWRN6oAdzwSWW27wD/8DXFFRx7l1n x-microsoft-antispam: BCL:0; ARA:14566002|19110799006|15080799009|8060799009|8062599006|7092599006|461199028|3412199025|440099028|10035399007|56899033|102099032; x-microsoft-antispam-message-info: =?us-ascii?Q?53x33PIUtb0HYwT/Gcm3EanTr0/5O86SxTOgKtkq6+2twQCqOFbG7z+x4lXS?= =?us-ascii?Q?IOU1Eo+P+j00JY7bZhiVHX0+q5SOOrdBv5Vd5MQHlSwfct5CExwYhw3BkVNd?= =?us-ascii?Q?9sR1MMjMUeRIxPKubcCWpLS+UrNZuVcOc2C//LCZ5hzW9zLhXZvQ5CsxbuFw?= =?us-ascii?Q?3HAaSbKs3a6VC035TFUKDtW1Y/FjF2iJFXkJR320c+a8DFOA3fROhxcc2SgY?= =?us-ascii?Q?tV5S9YvUsIkOHHsXS49R7HCOfJe6KvhoIHbZtYSJZ2bQzMi+GHobgPvBuJCs?= =?us-ascii?Q?ewBHbLRAbEAqf8QH4tqjgXgGwWtHeEJA2moExMyOw2odcCpXgdmQ8hF36KS7?= =?us-ascii?Q?5id/s3J/siHTldxDEBO49yH2T8vuVyv8zEcf3APN4JyHIAY1ujMBz+m6VX9E?= =?us-ascii?Q?exJMdAZPJV5bTXrPwU4RZJ4Mg23WrdwR4u7xJV0jtH9A862T009SylD6/IdH?= =?us-ascii?Q?w340wM2nBtZoKBJoZINQjog1KHmjywkRopx29Q5OkY2Iilfg4M9BhY6roReX?= =?us-ascii?Q?xQoks5YpzET8zlT5PMwkobaiMuaROC2alYB4AMeOls+LH460fPMsrjiyMRf/?= =?us-ascii?Q?r7Fk/qzSTHYwuv0YCrQfclFpGVF/qh6QSC9qW+DUIjRuSyzsUWHtXIUSMfpL?= =?us-ascii?Q?sKQVTJs+2F4JwyGPMklTVybgDv/t2EJnmlVzhFcUtF+H6rItAPzeQimDr9NZ?= =?us-ascii?Q?hIl6owBIgufSu6sTVefp5fOE87Z8vxW05rAnj5VfbYoQj5qOar7uK2IrkClz?= =?us-ascii?Q?0bfux39/oeUZfC+b9sYUQ33Lo5LKhZImvcgx4cfQTuKgWHlA6Eq6iT2jvsMS?= =?us-ascii?Q?pude6WoonWE9vr1R3eLJrSdBaF30EyHYfFo6b4bQgTcAb3jbyXCNsIK1IOrf?= =?us-ascii?Q?odLmi60CR9ZaFIAgc3/a6zuXSsuHXTGapqHSAc1T/FBhIa4RcKijsSeuKw5N?= =?us-ascii?Q?VwsLfg92ZVEMnFp/0BxYL323zJTzo1I+EXpQJtWAQjedBSY0mjjTM+rYFU52?= =?us-ascii?Q?PxBYA0uwhDK069I7x+5xNaC5e/Mt3M8mJ1BieAhBMnfvPVrp5wvacje/MCbS?= =?us-ascii?Q?Exw4qxzs2rQCn4NPxwxG1JtmRZxj9uuRmuD8XnInrv3RQR0h7CWO3NSGuG0A?= =?us-ascii?Q?9FkQ0mCbkBvATzaOcMHkDB6rSePjdo8g5DX79On9R2nyeLtNhFwkJkVoT7m0?= =?us-ascii?Q?9MMnXu/LyQ9n3yHy3pga9Q1aqpwSziFF4TL9Qw=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?h+j0DwhsYm8AXictjT5dMNOXmFPpVGY/PuuE8kgGwzsjYCYz6gAtFH4/NRYi?= =?us-ascii?Q?QQIprjV7iSFc3JN8xPYje3BJezATPPdDrWXZaGqQrMfIkaLyq5uRQj1AJ17v?= =?us-ascii?Q?qgNhfKXjjCsCF6Mnh6pZAk660DFj6wYoolHt1vx3UccfK5d24lGGwMdYaU4o?= =?us-ascii?Q?oyoSPHhGIh+nJTgLkjLLkZTdSfYsrOaEEJZG/RXaqOyoBbD7n+/2tApCCkG0?= =?us-ascii?Q?LeoOH5rtJd2SILF+Ml1isfpgmKKHVZxFqXKDNUQ4cB7rkDDOins3ei1Kos+l?= =?us-ascii?Q?YFjlXAxOWBEbGvFxxqu6E1NNrvr/ozPsvXBY8z2mbo6mPbISpI229GbsI21w?= =?us-ascii?Q?UzHIUz3guXJXqjAfTcTIRhDHCVQbbhDzHVkdoNf0dmuELsYwgjvixZ7T/2Zq?= =?us-ascii?Q?WsPggz5AyKmx5L698RXuFLti2JAl0YhJDVrlT+KLuK3bQYwZOraqEDlAwPIv?= =?us-ascii?Q?rGXp5mM9ZGNFp11NJuBI/PzAZ7SDAEqgBSwgjrvbVN1Qp9WNMdOMNj3mgWGM?= =?us-ascii?Q?XTBNzwbB2JlH3ZfqkAjZ+OfDXhRl5MnKTmJ5Euf37wQ7KTbE9wf5e/QOPmWv?= =?us-ascii?Q?lb3FN08saewnqq9EndPvwMftzl1XoLWdxu3i65wLCk7bpcaOKXXk/C/n+hyZ?= =?us-ascii?Q?XYLSDWWCJ8r01tMQxWruWVfi5PoEHRPP921uDy3q4a+y65dmYJuUMx6h99LK?= =?us-ascii?Q?JA9hPsxIiOmYE9xGWMmGCrwK1wEr0NAK+jalTj4wD6Pf9EAPYlqF6uc9T3SH?= =?us-ascii?Q?B5aFDkNJovHe3P4BmMShZgeK/eXGUbFww4i6X5+OsVEUVJT9FSgWKyuoURXM?= =?us-ascii?Q?k8bboOjYMEFg9nxkMinqp5nRQl6A1MXBIoFj2vZ+ANcYLWVzQ8MFkpT2ze6c?= =?us-ascii?Q?TSRTC6JcrMOjXRV2K8aJ7nC5rIxzV2jJfkaFWHlcLf2PpoNqAYjyin/1uYcO?= =?us-ascii?Q?AOIGMHBbc2kHedTTepGTwiNYALiCoHo68jaAg51+yn7dkkIo6oDbGXvjS5xF?= =?us-ascii?Q?e6on1mL6Dl/VqUn3COtqoFHzyytHvmSykbqZRusw0SWCsLwUxQDNV4qATmap?= =?us-ascii?Q?yCU0VL28V3ZrWknb22EyRH0JDZwbhvGs5yYlZjRK9mNQdUSZvlcDuLuAV0SJ?= =?us-ascii?Q?K1o13xJE1HovknSSc6WwWj81lmKz1NzXLiER/Cr0c6JXA/gUhONwCGSNIrlZ?= =?us-ascii?Q?UEd5o3ZCFqQlLffdl17/KC9R2irZF0NjeK8JMOIliu8OACFHpei2Z8sRgWU?= =?us-ascii?Q?=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-8534-20-msonline-outlook-c7cf3.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 8ddaed0f-e7a1-4e99-56c8-08dd9cc19842 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 May 2025 01:55:45.3253 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3P223MB1744 Subject: Re: [FFmpeg-devel] [PATCH 4/5] ffbuild/common.mak: clean up and move fftools/resources-specific code its Makefile 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Hi Ramiro, > -----Original Message----- > From: ffmpeg-devel On Behalf Of Ramiro Polla > Sent: Dienstag, 27. Mai 2025 03:33 > To: ffmpeg-devel@ffmpeg.org > Subject: [FFmpeg-devel] [PATCH 4/5] ffbuild/common.mak: clean up and move > fftools/resources-specific code its Makefile > > - Intermediate files are no longer removed; Why? That's the way it's meant to work and it's working fine (will push tomorrow) > - A .res suffix has been added to resource files, so that there's no > need to add new rules for each new filetype; I don't want this. I want the editor to be aware of the file type when opening. Thanks, sw > - Superfluous comments have been removed; > - Targets depending on CONFIG_RESOURCE_COMPRESSION have been > deduplicated. > --- > ffbuild/common.mak | 45 +------------------ > fftools/resources/.gitignore | 7 ++- > fftools/resources/Makefile | 31 ++++++++++--- > .../resources/{graph.css => graph.css.res} | 0 > .../resources/{graph.html => graph.html.res} | 0 > fftools/resources/resman.c | 12 ++--- > 6 files changed, 36 insertions(+), 59 deletions(-) > rename fftools/resources/{graph.css => graph.css.res} (100%) > rename fftools/resources/{graph.html => graph.html.res} (100%) > > diff --git a/ffbuild/common.mak b/ffbuild/common.mak > index ddf48923ea..27dd48a4e6 100644 > --- a/ffbuild/common.mak > +++ b/ffbuild/common.mak > @@ -139,46 +139,6 @@ else > $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst > .,_,$(basename $(notdir $@))) > endif > > -# 1) Preprocess CSS to a minified version > -%.css.min: TAG = SED > -%.css.min: %.css > - $(M)sed 's!/\\*.*\\*/!!g' $< \ > - | tr '\n' ' ' \ > - | tr -s ' ' \ > - | sed 's/^ //; s/ $$//' \ > - > $@ > - > -ifdef CONFIG_RESOURCE_COMPRESSION > - > -# 2) Gzip the minified CSS > -%.css.min.gz: TAG = GZIP > -%.css.min.gz: %.css.min > - $(M)gzip -nc9 $< > $@ > - > -# 3) Convert the gzipped CSS to a .c array > -%.css.c: %.css.min.gz $(BIN2CEXE) > - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > - > -# 4) Gzip the HTML file (no minification needed) > -%.html.gz: TAG = GZIP > -%.html.gz: %.html > - $(M)gzip -nc9 $< > $@ > - > -# 5) Convert the gzipped HTML to a .c array > -%.html.c: %.html.gz $(BIN2CEXE) > - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > - > -else # NO COMPRESSION > - > -# 2) Convert the minified CSS to a .c array > -%.css.c: %.css.min $(BIN2CEXE) > - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > - > -# 3) Convert the plain HTML to a .c array > -%.html.c: %.html $(BIN2CEXE) > - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > -endif > - > clean:: > $(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%) > > @@ -229,10 +189,9 @@ SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS- > ) > SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) > HOBJS = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o)) > PTXOBJS = $(filter %.ptx.o,$(OBJS)) > -RESOURCEOBJS = $(filter %.css.o %.html.o,$(OBJS)) > $(HOBJS): CCFLAGS += $(CFLAGS_HEADERS) > checkheaders: $(HOBJS) > -.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) > $(PTXOBJS:.o=) $(RESOURCEOBJS:.o=.c) $(RESOURCEOBJS:%.css.o=%.css.min) > $(RESOURCEOBJS:%.css.o=%.css.min.gz) $(RESOURCEOBJS:%.html.o=%.html.gz) > $(RESOURCEOBJS:.o=) > +.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) > $(PTXOBJS:.o=) > > alltools: $(TOOLS) > > @@ -252,7 +211,7 @@ $(TOOLOBJS): | tools > > OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SHLIBOBJS) > $(STLIBOBJS) $(TESTOBJS)) > > -CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx > *.ptx.gz *.ptx.c *.ver *.version *.html.gz *.html.c *.css.gz *.css.c > *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb > +CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx > *.ptx.gz *.ptx.c *.ver *.version *.min.res *.res.gz *.res.c > *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb > LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a > > define RULES > diff --git a/fftools/resources/.gitignore b/fftools/resources/.gitignore > index 5f496535a6..4c56856284 100644 > --- a/fftools/resources/.gitignore > +++ b/fftools/resources/.gitignore > @@ -1,4 +1,3 @@ > -*.html.c > -*.css.c > -*.html.gz > -*.css.gz > +*.res.c > +*.res.gz > +*.res > diff --git a/fftools/resources/Makefile b/fftools/resources/Makefile > index 8579a52678..a8eb111441 100644 > --- a/fftools/resources/Makefile > +++ b/fftools/resources/Makefile > @@ -1,13 +1,32 @@ > clean:: > $(RM) $(CLEANSUFFIXES:%=fftools/resources/%) > > -vpath %.html $(SRC_PATH) > -vpath %.css $(SRC_PATH) > +vpath %.res $(SRC_PATH) > > -# Uncomment to prevent deletion during build > -#.PRECIOUS: %.css.c %.css.min %.css.gz %.css.min.gz %.html.gz %.html.c > +RESOURCEOBJS += fftools/resources/graph.css.min.res.o > +RESOURCEOBJS += fftools/resources/graph.html.res.o > > OBJS-resman += \ > fftools/resources/resman.o \ > - fftools/resources/graph.html.o \ > - fftools/resources/graph.css.o \ > + $(RESOURCEOBJS) > + > +%.css.min.res: TAG = SED > +%.css.min.res: %.css.res > + $(M)sed 's!/\\*.*\\*/!!g' $< \ > + | tr '\n' ' ' \ > + | tr -s ' ' \ > + | sed 's/^ //; s/ $$//' \ > + > $@ > + > +ifdef CONFIG_RESOURCE_COMPRESSION > +RES_GZ = .gz > +endif > + > +%.res.gz: TAG = GZIP > +%.res.gz: %.res > + $(M)gzip -nc9 $< > $@ > + > +%.res.c: %.res$(RES_GZ) $(BIN2CEXE) > + $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > + > +.SECONDARY: $(RESOURCEOBJS:.o=) $(RESOURCEOBJS:.o=.c) $(RESOURCEOBJS:.o=.gz) > diff --git a/fftools/resources/graph.css b/fftools/resources/graph.css.res > similarity index 100% > rename from fftools/resources/graph.css > rename to fftools/resources/graph.css.res > diff --git a/fftools/resources/graph.html b/fftools/resources/graph.html.res > similarity index 100% > rename from fftools/resources/graph.html > rename to fftools/resources/graph.html.res > diff --git a/fftools/resources/resman.c b/fftools/resources/resman.c > index a9e21626fa..00518efd87 100644 > --- a/fftools/resources/resman.c > +++ b/fftools/resources/resman.c > @@ -38,15 +38,15 @@ > #include "libavutil/dict.h" > #include "libavutil/common.h" > > -extern const unsigned char ff_graph_html_data[]; > -extern const unsigned int ff_graph_html_len; > +extern const unsigned char ff_graph_html_res_data[]; > +extern const unsigned int ff_graph_html_res_len; > > -extern const unsigned char ff_graph_css_data[]; > -extern const unsigned ff_graph_css_len; > +extern const unsigned char ff_graph_css_min_res_data[]; > +extern const unsigned ff_graph_css_min_res_len; > > static const FFResourceDefinition resource_definitions[] = { > - [FF_RESOURCE_GRAPH_CSS] = { FF_RESOURCE_GRAPH_CSS, "graph.css", > &ff_graph_css_data[0], &ff_graph_css_len }, > - [FF_RESOURCE_GRAPH_HTML] = { FF_RESOURCE_GRAPH_HTML, "graph.html", > &ff_graph_html_data[0], &ff_graph_html_len }, > + [FF_RESOURCE_GRAPH_CSS] = { FF_RESOURCE_GRAPH_CSS, "graph.css", > &ff_graph_css_min_res_data[0], &ff_graph_css_min_res_len }, > + [FF_RESOURCE_GRAPH_HTML] = { FF_RESOURCE_GRAPH_HTML, "graph.html", > &ff_graph_html_res_data[0], &ff_graph_html_res_len }, > }; > > > -- > 2.39.5 > > _______________________________________________ > 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". _______________________________________________ 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".