From 6a69a212a0f25c37f025e80fbbf5c228bf00f4bc Mon Sep 17 00:00:00 2001
From: tgotic <tgotic@users.sourceforge.net>
Date: Wed, 4 May 2011 21:50:02 +0200
Subject: [PATCH] version strings updated to 2.4.2

---
 backend/Makefile.mingw      | 4 ++--
 backend/dllversion.c        | 8 ++++----
 backend_qt4/backend_vcx.pro | 4 ++--
 frontend/Makefile.mingw     | 7 ++++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw
index 99434b00..3345742c 100644
--- a/backend/Makefile.mingw
+++ b/backend/Makefile.mingw
@@ -6,7 +6,7 @@
 # make clean		cleans up a previous compilation and any object or editor files
 #
 
-ZINT_VERSION:=-DZINT_VERSION=\"2.4.1\"
+ZINT_VERSION:=-DZINT_VERSION=\"2.4.2\"
 
 
 CC:= gcc -m32
@@ -15,7 +15,7 @@ AR:= ar rc
 RANLIB:= ranlib
 INCLUDE:= -I/mingw/include
 CFLAGS:= -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall
-LDFLAGS = -Wl,--major-image-version=2 -Wl,--minor-image-version=40
+LDFLAGS = -Wl,--major-image-version=2 -Wl,--minor-image-version=42
 RC:= windres 
 RCFLAGS:= -v -F pe-i386 --define GCC_WINDRES
 
diff --git a/backend/dllversion.c b/backend/dllversion.c
index cb2b0699..50f1653a 100644
--- a/backend/dllversion.c
+++ b/backend/dllversion.c
@@ -1,5 +1,5 @@
 /* Sed: http://msdn.microsoft.com/library/en-us/shellcc/platform/shell/programmersguide/versions.asp */
-#if defined (WIN32) && (defined(_USRDLL) || defined(DLL_EXPORT) || defined(PIC))
+#if defined (_WIN32) && (defined(_USRDLL) || defined(DLL_EXPORT) || defined(PIC))
 #include <windows.h>
 #include <shlwapi.h>
 
@@ -21,11 +21,11 @@ HRESULT DllGetVersion (DLLVERSIONINFO2* pdvi)
 		
 	pdvi->info1.dwMajorVersion = 2;
 	pdvi->info1.dwMinorVersion = 4;
-	pdvi->info1.dwBuildNumber = 1;
+	pdvi->info1.dwBuildNumber = 2;
 	pdvi->info1.dwPlatformID = DLLVER_PLATFORM_WINDOWS;
 	if (sizeof(DLLVERSIONINFO2) == pdvi->info1.cbSize)
-		pdvi->ullVersion = MAKEDLLVERULL(2, 4, 1, 0);
+		pdvi->ullVersion = MAKEDLLVERULL(2, 4, 2, 0);
 	
 	return S_OK;
 }
-#endif /* WIN32 */
+#endif /* _WIN32 */
diff --git a/backend_qt4/backend_vcx.pro b/backend_qt4/backend_vcx.pro
index c3bb60ce..744b8b25 100644
--- a/backend_qt4/backend_vcx.pro
+++ b/backend_qt4/backend_vcx.pro
@@ -1,10 +1,10 @@
 win32 {
 	TEMPLATE = vclib
-	CONFIG += staticlib debug-and-release
+	CONFIG += staticlib release
 }
 
 TARGET = QtZint2
-VERSION = 2.4.1
+VERSION = 2.4.2
 
 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305
 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305
diff --git a/frontend/Makefile.mingw b/frontend/Makefile.mingw
index be35ab7e..d2fb56c1 100644
--- a/frontend/Makefile.mingw
+++ b/frontend/Makefile.mingw
@@ -6,10 +6,11 @@
 # make clean		cleans up a previous compilation and any object or editor files
 #
 
-ZINT_VERSION:=-DZINT_VERSION=\"2.4.1\"
+ZINT_VERSION:=-DZINT_VERSION=\"2.4.2\"
 
 CC := gcc -m32
 CFLAGS := -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend
+LDFLAGS = -Wl,--major-image-version=2 -Wl,--minor-image-version=42
 prefix := /mingw
 bindir := $(prefix)/bin
 DESTDIR :=
@@ -27,10 +28,10 @@ all: zint zint_static
 	windres -v -F pe-i386 --define GCC_WINDRES -O coff --input-format=rc -i $< -o $@
 
 zint: main.c zint.res
-	$(CC) $(CFLAGS) -DZINT_DLL $(DEFINES_DLL) $(ZINT_VERSION)  $? zint.res -o $@ -L../backend -lzint.dll $(LIBS)
+	$(CC) $(CFLAGS) -DZINT_DLL $(DEFINES_DLL) $(ZINT_VERSION) $(LDFLAGS) $? 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 $(LIBS)
+	$(CC) -static $(CFLAGS) $(ZINT_VERSION) $(LDFLAGS) $? zint.res -o $@ -L../backend -lzint $(LIBS)
 
 .PHONY: install uninstall clean dist