From 85f8cce0137b39c68b99bc1790aa0ccc6c8b15c6 Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 1 Jun 2017 13:22:46 +0000 Subject: [PATCH] hard-code windres output format to pe-i386 ideally windres output would be based on the ./configure --host=XXX type. Maybe someday I'll figure it out but for now, when using cygwin to build privoxy, use ./configure --host=i686-w64-mingw32 and it'll work using either the 32 or 64 bit version of cygwin. --- GNUmakefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 5c569591..c9ead67c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: GNUmakefile is built automatically from GNUmakefile.in # -# $Id: GNUmakefile.in,v 1.261 2017/05/25 11:14:27 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.262 2017/05/25 11:15:34 fabiankeil Exp $ # # Written by and Copyright (C) 2001-2017 members of the # Privoxy team. https://www.privoxy.org/ @@ -732,7 +732,7 @@ w32taskbar.@OBJEXT@: w32taskbar.c config.h w32log.h w32taskbar.h win32.@OBJEXT@: win32.c config.h jcc.h loadcfg.h pcre/pcre.h pcre/pcreposix.h pcrs.h project.h w32log.h win32.h w32svrapi.h w32.res: w32.rc w32res.h icons/radar-01.ico icons/radar-02.ico icons/radar-03.ico icons/radar-04.ico icons/radar-05.ico icons/radar-06.ico icons/radar-07.ico icons/radar-08.ico icons/idle.ico icons/privoxy.ico config.h - windres -D__MINGW32__=0.2 -O coff -i $< -o $@ + windres -F pe-i386 -D__MINGW32__=0.2 -O coff -i $< -o $@ # AmigaOS @AMIGAOS_ONLY@OBJS += amiga.o -- 2.39.2