From b4996f00b4de5d014ffbd1db9fe96e26c555f804 Mon Sep 17 00:00:00 2001
From: tgotic <tgotic@users.sourceforge.net>
Date: Mon, 17 Jan 2011 19:55:39 +0100
Subject: [PATCH] version updated to 2.4.1 some improvments

---
 frontend/Makefile.mingw | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/frontend/Makefile.mingw b/frontend/Makefile.mingw
index 859ac02e..be35ab7e 100644
--- a/frontend/Makefile.mingw
+++ b/frontend/Makefile.mingw
@@ -1,4 +1,4 @@
-# Linux makefile for zint - requires libzint
+# MinGW makefile for zint - requires libzint
 #
 # make			compiles zint
 # make install		copies binary to /usr/bin
@@ -6,24 +6,31 @@
 # make clean		cleans up a previous compilation and any object or editor files
 #
 
-ZINT_VERSION:=-DZINT_VERSION=\"2.3.2\"
+ZINT_VERSION:=-DZINT_VERSION=\"2.4.1\"
 
-CC := gcc
-CFLAGS := -D_WIN32 -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend
+CC := gcc -m32
+CFLAGS := -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend
 prefix := /mingw
 bindir := $(prefix)/bin
 DESTDIR :=
 
+ifeq ($(NO_PNG),true)
+DEFINES+= -DNO_PNG
+else
+DEFINES_DLL+= -DPNG_DLL -DZLIB_DLL
+LIBS+= -lpng -lz
+endif
+
 all: zint zint_static
 
 %.res:%.rc
-	windres -O coff --input-format=rc -i $< -o $@
+	windres -v -F pe-i386 --define GCC_WINDRES -O coff --input-format=rc -i $< -o $@
 
 zint: main.c zint.res
-	$(CC) $(CFLAGS) -DZINT_DLL -DPNG_DLL -DZLIB_DLL $(ZINT_VERSION)  $? zint.res -o $@ -L../backend  -lzint
+	$(CC) $(CFLAGS) -DZINT_DLL $(DEFINES_DLL) $(ZINT_VERSION)  $? zint.res -o $@ -L../backend -lzint.dll $(LIBS)
 
 zint_static: main.c zint.res
-	$(CC) -static $(CFLAGS) $(ZINT_VERSION) $? zint.res -o $@ -L../backend -lzint -lpng -lz
+	$(CC) -static $(CFLAGS) $(ZINT_VERSION) $? zint.res -o $@ -L../backend -lzint $(LIBS)
 
 .PHONY: install uninstall clean dist