From 5fdecd20bdd369b768f232e08c3e48542fad2be4 Mon Sep 17 00:00:00 2001 From: Harald Oehlmann Date: Mon, 12 Dec 2016 15:38:38 +0100 Subject: [PATCH] Set Version 2.5.3 for TCL ZINT and 2.5.1 for zint.exe --- backend_tcl/configure.in | 2 +- backend_tcl/lib/zint/pkgIndex.tcl | 2 +- backend_tcl/zint.c | 6 ++++-- win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/backend_tcl/configure.in b/backend_tcl/configure.in index d1621614..60f901ac 100644 --- a/backend_tcl/configure.in +++ b/backend_tcl/configure.in @@ -14,7 +14,7 @@ # so you can encode the package version directly into the source files. #----------------------------------------------------------------------- -AC_INIT([zint], [2.5.2]) +AC_INIT([zint], [2.5.3]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/backend_tcl/lib/zint/pkgIndex.tcl b/backend_tcl/lib/zint/pkgIndex.tcl index 5782d243..c1ef247a 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.5.2\ +package ifneeded zint 2.5.3\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c index 30477f95..60b72aaa 100644 --- a/backend_tcl/zint.c +++ b/backend_tcl/zint.c @@ -37,7 +37,9 @@ - Added Codablock F options "-rows". - Adopted to new image format of zint 2016-10-14 2.5.2 HaO -- Include the upstream reverted image format +- Include the upstream reverted image format + 2016-12-12 2.5.3 HaO +- No changes here, take 2.5.1 framework files */ #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) @@ -77,7 +79,7 @@ /*----------------------------------------------------------------------------*/ /* > File option defines */ -#define VERSION "2.5.2" +#define VERSION "2.5.3" /*----------------------------------------------------------------------------*/ /* >>>>> Hepler defines */ diff --git a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp index 6cddb760..25e1a957 100644 --- a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp +++ b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.5\"" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.5.1\"" /c # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe