From 62cc9e49f5ed9b6421c0fbe69bdc3caa1124f060 Mon Sep 17 00:00:00 2001 From: gitlost Date: Sat, 14 Aug 2021 16:11:25 +0100 Subject: [PATCH] Bump version to 2.10.0.9 (dev) --- CMakeLists.txt | 2 +- ChangeLog | 8 +++++++- backend/Makefile.mingw | 2 +- backend/libzint.rc | 4 ++-- backend/zintconfig.h | 2 +- backend_qt/backend_qt.pro | 4 ++-- backend_qt/backend_vc8.pro | 2 +- backend_tcl/zint_tcl.dsp | 4 ++-- docs/manual.txt | 2 +- frontend/Makefile.mingw | 2 +- frontend/zint.rc | 4 ++-- frontend_qt/res/qtZint.rc | 4 ++-- win32/libzint.vcxproj | 4 ++-- win32/vs2008/libzint.vcproj | 6 +++--- win32/vs2008/zint.vcproj | 6 +++--- win32/vs2015/libzint.vcxproj | 12 ++++++------ win32/vs2015/vsx/libzintMD.vcxproj | 2 +- win32/vs2015/zint.vcxproj | 12 ++++++------ win32/vs2019/libzint.vcxproj | 4 ++-- win32/vs2019/zint.vcxproj | 4 ++-- win32/zint.vcxproj | 4 ++-- win32/zint_cmdline_vc6/zint.rc | 4 ++-- win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp | 4 ++-- zint.nsi | 2 +- 24 files changed, 55 insertions(+), 49 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c378a755..ad8e2980 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 10) set(ZINT_VERSION_RELEASE 0) -set(ZINT_VERSION_BUILD 0) # Set to 0 before release, set to 9 after release +set(ZINT_VERSION_BUILD 9) # Set to 0 before release, set to 9 after release set(ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}.${ZINT_VERSION_BUILD}") add_definitions(-DZINT_VERSION=\"${ZINT_VERSION}\") diff --git a/ChangeLog b/ChangeLog index b615ba8e..bfb67737 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Version 2.10.0.9 (dev) not released yet +======================================= + +- Placeholder + + Version 2.10.0 2021-08-14 ========================= @@ -47,7 +53,7 @@ Changes sanitizer flag detection, and many other improvements, props Alonso Schaich - PLESSEY: add options NCR weighted mod-10, hide check digit(s) in HRT - Fuller error messages; more comments zint.h -- CMake: simplication and modernization, Qt5/6 version, props Null Void +- CMake: simplication and modernization, Qt5/6 version, props Null Void (atom) - POSTNET/PLANET: allow up to 38 chars (ZINT_WARN_NONCOMPLIANT) (see [d7ac9c]) - RMQR: update to new draft ISO/IEC JTC1/SC31N000 (Draft 2019-6-24) - ULTRA: update max size and min cols based on BWIPP 2021-07-14 update diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index 942afb9d..20efbbde 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.10.0\" +ZINT_VERSION:=-DZINT_VERSION=\"2.10.0.9\" CC:= gcc diff --git a/backend/libzint.rc b/backend/libzint.rc index eefac77c..33aa0687 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,10,0,0 -#define VER_FILEVERSION_STR "2,10,0,0\0" +#define VER_FILEVERSION 2,10,0,9 +#define VER_FILEVERSION_STR "2,10,0,9\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/backend/zintconfig.h b/backend/zintconfig.h index 32476328..12451aa6 100644 --- a/backend/zintconfig.h +++ b/backend/zintconfig.h @@ -36,6 +36,6 @@ #define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MINOR 10 #define ZINT_VERSION_RELEASE 0 -#define ZINT_VERSION_BUILD 0 +#define ZINT_VERSION_BUILD 9 #endif /* ZINTCONFIG_H */ diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index 85fa633b..8d145539 100644 --- a/backend_qt/backend_qt.pro +++ b/backend_qt/backend_qt.pro @@ -17,7 +17,7 @@ TARGET = QtZint INCLUDEPATH += ../backend #EDIT THIS !!!! -DEFINES += ZINT_VERSION="\\\"2.10.0\\\"" +DEFINES += ZINT_VERSION="\\\"2.10.0.9\\\"" !contains(DEFINES, NO_PNG) { INCLUDEPATH += ../../lpng @@ -117,7 +117,7 @@ SOURCES += ../backend/2of5.c \ ../backend/dllversion.c \ qzint.cpp -VERSION = 2.10.0 +VERSION = 2.10.0.9 #DESTDIR = . diff --git a/backend_qt/backend_vc8.pro b/backend_qt/backend_vc8.pro index 3fe31dc4..0a30eb77 100644 --- a/backend_qt/backend_vc8.pro +++ b/backend_qt/backend_vc8.pro @@ -4,7 +4,7 @@ win32 { } TARGET = QtZint2 -VERSION = 2.10.0 +VERSION = 2.10.0.9 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 diff --git a/backend_tcl/zint_tcl.dsp b/backend_tcl/zint_tcl.dsp index e8c13620..12049e08 100644 --- a/backend_tcl/zint_tcl.dsp +++ b/backend_tcl/zint_tcl.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.10.0\"" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.10.0.9\"" /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.10.0\"" /c +# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.10.0.9\"" /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" diff --git a/docs/manual.txt b/docs/manual.txt index aad1911c..314f08c9 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -3031,7 +3031,7 @@ those owners, companies or organisations. 7.3 Version Information ----------------------- -The current version of Zint is 2.10.0. See "ChangeLog" in the project root +The current version of Zint is 2.10.0.9. See "ChangeLog" in the project root directory for information on all releases. 7.4 Sources of Information diff --git a/frontend/Makefile.mingw b/frontend/Makefile.mingw index f4a2ffae..a9920ee9 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.10.0\" +ZINT_VERSION:=-DZINT_VERSION=\"2.10.0.9\" CC := gcc CFLAGS := -D_WIN32 -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend diff --git a/frontend/zint.rc b/frontend/zint.rc index ade6160b..bc80932d 100644 --- a/frontend/zint.rc +++ b/frontend/zint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,10,0,0 -#define VER_FILEVERSION_STR "2,10,0,0\0" +#define VER_FILEVERSION 2,10,0,9 +#define VER_FILEVERSION_STR "2,10,0,9\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/frontend_qt/res/qtZint.rc b/frontend_qt/res/qtZint.rc index 981d0c7d..2db0c1b4 100644 --- a/frontend_qt/res/qtZint.rc +++ b/frontend_qt/res/qtZint.rc @@ -5,8 +5,8 @@ #include -#define VER_FILEVERSION 2,10,0,0 -#define VER_FILEVERSION_STR "2,10,0,0\0" +#define VER_FILEVERSION 2,10,0,9 +#define VER_FILEVERSION_STR "2,10,0,9\0" #ifdef GCC_WINDRES diff --git a/win32/libzint.vcxproj b/win32/libzint.vcxproj index 1216f887..adc6ec3f 100644 --- a/win32/libzint.vcxproj +++ b/win32/libzint.vcxproj @@ -57,7 +57,7 @@ Disabled ..\..\zlib\;..\..\lpng\;..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -92,7 +92,7 @@ MaxSpeed false ..\..\zlib\;..\..\lpng\;..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/win32/vs2008/libzint.vcproj b/win32/vs2008/libzint.vcproj index 085db958..78be5706 100644 --- a/win32/vs2008/libzint.vcproj +++ b/win32/vs2008/libzint.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\support\lpng169;"..\..\zlib128-dll\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0.9\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG" MinimalRebuild="true" ExceptionHandling="0" BasicRuntimeChecks="3" @@ -127,7 +127,7 @@ Optimization="2" EnableIntrinsicFunctions="false" AdditionalIncludeDirectories="..\..\..\support\lpng169;"..\..\zlib128-dll\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0.9\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="2" @@ -212,7 +212,7 @@ Optimization="2" EnableIntrinsicFunctions="false" AdditionalIncludeDirectories="d:\opt\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0\""" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0.9\""" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="2" diff --git a/win32/vs2008/zint.vcproj b/win32/vs2008/zint.vcproj index d2cb6a21..dd791c7c 100644 --- a/win32/vs2008/zint.vcproj +++ b/win32/vs2008/zint.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\backend" - PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0\"";ZINT_DLL" + PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0.9\"";ZINT_DLL" MinimalRebuild="true" ExceptionHandling="0" BasicRuntimeChecks="3" @@ -115,7 +115,7 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\backend" - PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0\"";ZINT_DLL" + PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0.9\"";ZINT_DLL" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="0" @@ -187,7 +187,7 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\backend" - PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0\""" + PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.10.0.9\""" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="2" diff --git a/win32/vs2015/libzint.vcxproj b/win32/vs2015/libzint.vcxproj index 4aa2979e..169075c2 100644 --- a/win32/vs2015/libzint.vcxproj +++ b/win32/vs2015/libzint.vcxproj @@ -117,7 +117,7 @@ Disabled ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";NO_PNG;BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";NO_PNG;BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -150,7 +150,7 @@ Disabled ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - NO_PNG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) + NO_PNG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) EnableFastChecks @@ -184,7 +184,7 @@ MaxSpeed false ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;NO_PNG;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;NO_PNG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -218,7 +218,7 @@ MaxSpeed false ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";BUILD_ZINT_DLL;NO_PNG;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";BUILD_ZINT_DLL;NO_PNG;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions) true @@ -254,7 +254,7 @@ MaxSpeed false ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";%(PreprocessorDefinitions) true MultiThreadedDLL @@ -278,7 +278,7 @@ MaxSpeed false ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";%(PreprocessorDefinitions) true diff --git a/win32/vs2015/vsx/libzintMD.vcxproj b/win32/vs2015/vsx/libzintMD.vcxproj index 39d06c58..cc703499 100644 --- a/win32/vs2015/vsx/libzintMD.vcxproj +++ b/win32/vs2015/vsx/libzintMD.vcxproj @@ -39,7 +39,7 @@ MaxSpeed true d:\opt1\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";NO_PNG;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";NO_PNG;%(PreprocessorDefinitions) true diff --git a/win32/vs2015/zint.vcxproj b/win32/vs2015/zint.vcxproj index 69907d23..69a05161 100644 --- a/win32/vs2015/zint.vcxproj +++ b/win32/vs2015/zint.vcxproj @@ -108,7 +108,7 @@ Disabled ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -127,7 +127,7 @@ Disabled ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) EnableFastChecks @@ -147,7 +147,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) true MultiThreaded @@ -165,7 +165,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) true @@ -186,7 +186,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";%(PreprocessorDefinitions) true MultiThreadedDLL @@ -205,7 +205,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";%(PreprocessorDefinitions) true diff --git a/win32/vs2019/libzint.vcxproj b/win32/vs2019/libzint.vcxproj index 13cfbf7f..74d383d9 100644 --- a/win32/vs2019/libzint.vcxproj +++ b/win32/vs2019/libzint.vcxproj @@ -57,7 +57,7 @@ Disabled ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -92,7 +92,7 @@ MaxSpeed false ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/win32/vs2019/zint.vcxproj b/win32/vs2019/zint.vcxproj index e12b6e6e..5b8528e3 100644 --- a/win32/vs2019/zint.vcxproj +++ b/win32/vs2019/zint.vcxproj @@ -53,7 +53,7 @@ Disabled ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -72,7 +72,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) true MultiThreaded diff --git a/win32/zint.vcxproj b/win32/zint.vcxproj index 1322818e..57d305b0 100644 --- a/win32/zint.vcxproj +++ b/win32/zint.vcxproj @@ -53,7 +53,7 @@ Disabled ..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -72,7 +72,7 @@ MaxSpeed ..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) true MultiThreaded diff --git a/win32/zint_cmdline_vc6/zint.rc b/win32/zint_cmdline_vc6/zint.rc index 500202bb..03d144e6 100644 --- a/win32/zint_cmdline_vc6/zint.rc +++ b/win32/zint_cmdline_vc6/zint.rc @@ -30,8 +30,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN // Version // -#define VER_FILEVERSION 2,10,0,0 -#define VER_FILEVERSION_STR "2,10,0,0\0" +#define VER_FILEVERSION 2,10,0,9 +#define VER_FILEVERSION_STR "2,10,0,9\0" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION diff --git a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp index 1076a20c..5277e02e 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.10.0\"" /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.10.0.9\"" /c # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\backend" /I "..\..\..\lpng" /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "NO_PNG" /D "DEBUG" /YX /FD /GZ /D ZINT_VERSION="\"2.10.0\"" /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\backend" /I "..\..\..\lpng" /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "NO_PNG" /D "DEBUG" /YX /FD /GZ /D ZINT_VERSION="\"2.10.0.9\"" /c # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe diff --git a/zint.nsi b/zint.nsi index dba26f2e..0005ccdf 100644 --- a/zint.nsi +++ b/zint.nsi @@ -10,7 +10,7 @@ ;****************************************************************************** !define PRODUCT_NAME "Zint" !define PRODUCT_EXE "qtZint.exe" -!define PRODUCT_VERSION "2.10.0" +!define PRODUCT_VERSION "2.10.0.9" !define PRODUCT_WEB_SITE "http://www.zint.org.uk" !define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}"