From 0cfcc41bb4827fc4b46c5f7e2627da7071295268 Mon Sep 17 00:00:00 2001 From: hooper114 Date: Thu, 6 Aug 2009 08:36:01 +0000 Subject: [PATCH] Update version to 2.1.1 --- CMakeLists.txt | 2 +- backend/Makefile | 4 ++-- backend/Makefile.mingw | 2 +- backend/dllversion.c | 6 +++--- frontend/Makefile | 2 +- frontend/Makefile.mingw | 2 +- readme | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f70dc15..266dc62f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set (ZINT_VERSION_MAJOR 2) set (ZINT_VERSION_MINOR 2) -set (ZINT_VERSION_RELEASE 0) +set (ZINT_VERSION_RELEASE 1) set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" ) add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall) diff --git a/backend/Makefile b/backend/Makefile index 0b40fd14..a7fddf42 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -7,7 +7,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.2.0\" +ZINT_VERSION:=-DZINT_VERSION=\"2.2.1\" CC := gcc @@ -41,7 +41,7 @@ libzint: code.c code128.c 2of5.c upcean.c medical.c telepen.c plessey.c postal.c $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(POSTAL) $(CC) -Wall -fPIC $(DEFINES) $(CFLAGS) $(ZINT_VERSION) -c $(TWODIM) $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(COMMON) - $(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.2.0 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS) + $(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.2.1 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS) ln -s libzint.so.* libzint.so .PHONY: install uninstall clean dist diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index bf64785a..55988970 100644 --- a/backend/Makefile.mingw +++ b/backend/Makefile.mingw @@ -7,7 +7,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.2.0\" +ZINT_VERSION:=-DZINT_VERSION=\"2.2.1\" CC:= gcc diff --git a/backend/dllversion.c b/backend/dllversion.c index 4c53894e..05008631 100644 --- a/backend/dllversion.c +++ b/backend/dllversion.c @@ -20,11 +20,11 @@ HRESULT DllGetVersion (DLLVERSIONINFO2* pdvi) return (E_INVALIDARG); pdvi->info1.dwMajorVersion = 2; - pdvi->info1.dwMinorVersion = 1; - pdvi->info1.dwBuildNumber = 3; + pdvi->info1.dwMinorVersion = 2; + pdvi->info1.dwBuildNumber = 1; pdvi->info1.dwPlatformID = DLLVER_PLATFORM_WINDOWS; if (sizeof(DLLVERSIONINFO2) == pdvi->info1.cbSize) - pdvi->ullVersion = MAKEDLLVERULL(2, 1, 3, 0); + pdvi->ullVersion = MAKEDLLVERULL(2, 2, 1, 0); return S_OK; } diff --git a/frontend/Makefile b/frontend/Makefile index f04a413f..29d38158 100644 --- a/frontend/Makefile +++ b/frontend/Makefile @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.2.0\" +ZINT_VERSION:=-DZINT_VERSION=\"2.2.1\" CC := gcc INCLUDE := -I/usr/local/include diff --git a/frontend/Makefile.mingw b/frontend/Makefile.mingw index f3642b23..411ab17d 100644 --- a/frontend/Makefile.mingw +++ b/frontend/Makefile.mingw @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.2.0\" +ZINT_VERSION:=-DZINT_VERSION=\"2.2.1\" CC := gcc CFLAGS := -D_WIN32 -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall diff --git a/readme b/readme index 8baa0316..ea561617 100644 --- a/readme +++ b/readme @@ -1,5 +1,5 @@ -Zint and libzint 2.2 --------------------- +Zint and libzint 2.2.1 +---------------------- Zint is a suite of programs to allow easy encoding of data in any of the wide range of public domain barcode standards and to allow integration of this capability into your own programs. This version of Zint is able to encode data in the following formats: