diff --git a/CMakeLists.txt b/CMakeLists.txt index dbe7ec1e..38f01feb 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 11) set(ZINT_VERSION_RELEASE 1) -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 5e784ef9..c13fe5bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 2.11.1.9 (dev) not released yet +======================================= + + Version 2.11.1 (2022-08-22) =========================== diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index 088df9c1..246717de 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.11.1\" +ZINT_VERSION:=-DZINT_VERSION=\"2.11.1.9\" CC:= gcc diff --git a/backend/libzint.rc b/backend/libzint.rc index 9151f342..114328af 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,11,1,0 -#define VER_FILEVERSION_STR "2.11.1.0\0" +#define VER_FILEVERSION 2,11,1,9 +#define VER_FILEVERSION_STR "2.11.1.9\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/backend/zintconfig.h b/backend/zintconfig.h index ca7f98dd..20a18bcc 100644 --- a/backend/zintconfig.h +++ b/backend/zintconfig.h @@ -36,6 +36,6 @@ #define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MINOR 11 #define ZINT_VERSION_RELEASE 1 -#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 5ba7132b..0372fa81 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.11.1\\\"" +DEFINES += ZINT_VERSION="\\\"2.11.1.9\\\"" !contains(DEFINES, NO_PNG) { INCLUDEPATH += ../../lpng @@ -116,7 +116,7 @@ SOURCES += ../backend/2of5.c \ ../backend/dllversion.c \ qzint.cpp -VERSION = 2.11.1 +VERSION = 2.11.1.9 #DESTDIR = . diff --git a/backend_qt/backend_vc8.pro b/backend_qt/backend_vc8.pro index 36c539fc..ece8cb8a 100644 --- a/backend_qt/backend_vc8.pro +++ b/backend_qt/backend_vc8.pro @@ -4,7 +4,7 @@ win32 { } TARGET = QtZint2 -VERSION = 2.11.1 +VERSION = 2.11.1.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 61f653a4..8faef640 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.11.1\"" /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.11.1.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.11.1\"" /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.11.1.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.pmd b/docs/manual.pmd index 3f833cf8..3291b8b8 100644 --- a/docs/manual.pmd +++ b/docs/manual.pmd @@ -1,5 +1,5 @@ % Zint Barcode Generator and Zint Barcode Studio User Manual -% Version 2.11.1 +% Version 2.11.1.9 % August 2022 # 1. Introduction diff --git a/docs/manual.txt b/docs/manual.txt index 779a9b82..d22bbbfe 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -1,5 +1,5 @@ Zint Barcode Generator and Zint Barcode Studio User Manual -Version 2.11.1 +Version 2.11.1.9 August 2022 ******************************************************************************* @@ -4120,7 +4120,7 @@ defined. Annex B. Man Page ZINT(1) -% ZINT(1) Version 2.11.1 % % August 2022 +% ZINT(1) Version 2.11.1.9 % % August 2022 NAME diff --git a/docs/zint.1 b/docs/zint.1 index b1011a33..a81305c1 100644 --- a/docs/zint.1 +++ b/docs/zint.1 @@ -14,7 +14,7 @@ . ftr VB CB . ftr VBI CBI .\} -.TH "ZINT" "1" "August 2022" "Version 2.11.1" "" +.TH "ZINT" "1" "August 2022" "Version 2.11.1.9" "" .hy .SH NAME .PP diff --git a/docs/zint.1.pmd b/docs/zint.1.pmd index de084542..1880ad7d 100644 --- a/docs/zint.1.pmd +++ b/docs/zint.1.pmd @@ -1,4 +1,4 @@ -% ZINT(1) Version 2.11.1 +% ZINT(1) Version 2.11.1.9 % % August 2022 diff --git a/frontend/Makefile.mingw b/frontend/Makefile.mingw index cc933499..6f84665a 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.11.1\" +ZINT_VERSION:=-DZINT_VERSION=\"2.11.1.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 ef0d6830..7cfd444e 100644 --- a/frontend/zint.rc +++ b/frontend/zint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,11,1,0 -#define VER_FILEVERSION_STR "2.11.1.0\0" +#define VER_FILEVERSION 2,11,1,9 +#define VER_FILEVERSION_STR "2.11.1.9\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/frontend_qt/res/qtZint.rc b/frontend_qt/res/qtZint.rc index 84a2949c..fafc8592 100644 --- a/frontend_qt/res/qtZint.rc +++ b/frontend_qt/res/qtZint.rc @@ -5,8 +5,8 @@ #include -#define VER_FILEVERSION 2,11,1,0 -#define VER_FILEVERSION_STR "2.11.1.0\0" +#define VER_FILEVERSION 2,11,1,9 +#define VER_FILEVERSION_STR "2.11.1.9\0" #ifdef GCC_WINDRES diff --git a/win32/libzint.vcxproj b/win32/libzint.vcxproj index 251a6943..c5859812 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.11.1";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.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.11.1";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/win32/vs2008/libzint.vcproj b/win32/vs2008/libzint.vcproj index ba03ac31..5c54694c 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.11.1\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1.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.11.1\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1.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.11.1\""" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1.9\""" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="2" diff --git a/win32/vs2008/zint.vcproj b/win32/vs2008/zint.vcproj index d794e15a..6c9b910c 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.11.1\"";ZINT_DLL" + PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1.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.11.1\"";ZINT_DLL" + PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1.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.11.1\""" + PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1.9\""" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="2" diff --git a/win32/vs2015/libzint.vcxproj b/win32/vs2015/libzint.vcxproj index 45fb63f4..a200d682 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.11.1";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.11.1.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.11.1";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.11.1.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.11.1";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.11.1.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.11.1";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.11.1.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.11.1";%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.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.11.1";%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.9";%(PreprocessorDefinitions) true diff --git a/win32/vs2015/vsx/libzintMD.vcxproj b/win32/vs2015/vsx/libzintMD.vcxproj index f3b9d831..c7ff9e58 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.11.1";NO_PNG;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.9";NO_PNG;%(PreprocessorDefinitions) true diff --git a/win32/vs2015/zint.vcxproj b/win32/vs2015/zint.vcxproj index 732168ad..4f00ac3a 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.11.1";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.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.11.1";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.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.11.1";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.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.11.1";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.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.11.1";%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.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.11.1";%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.9";%(PreprocessorDefinitions) true diff --git a/win32/vs2019/libzint.vcxproj b/win32/vs2019/libzint.vcxproj index 40300baf..5d7f120f 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.11.1";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.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.11.1";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/win32/vs2019/zint.vcxproj b/win32/vs2019/zint.vcxproj index fccee7a9..a7e2a9a0 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.11.1";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.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.11.1";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.9";ZINT_DLL;%(PreprocessorDefinitions) true MultiThreaded diff --git a/win32/zint.vcxproj b/win32/zint.vcxproj index 95232f78..50d92499 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.11.1";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.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.11.1";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1.9";ZINT_DLL;%(PreprocessorDefinitions) true MultiThreaded diff --git a/win32/zint_cmdline_vc6/zint.rc b/win32/zint_cmdline_vc6/zint.rc index 0ec80a09..7c8a475d 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,11,1,0 -#define VER_FILEVERSION_STR "2.11.1.0\0" +#define VER_FILEVERSION 2,11,1,9 +#define VER_FILEVERSION_STR "2.11.1.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 1cf48d8e..3dc7b830 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.11.1\"" /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.11.1.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.11.1\"" /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.11.1.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 1995e994..3e4e57c7 100644 --- a/zint.nsi +++ b/zint.nsi @@ -10,7 +10,7 @@ ;****************************************************************************** !define PRODUCT_NAME "Zint" !define PRODUCT_EXE "qtZint.exe" -!define PRODUCT_VERSION "2.11.1" +!define PRODUCT_VERSION "2.11.1.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}"