Version 2.16.0
@@ -8,9 +8,9 @@ project(zint-package)
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
set(ZINT_VERSION_MAJOR 2)
|
||||
set(ZINT_VERSION_MINOR 15)
|
||||
set(ZINT_VERSION_MINOR 16)
|
||||
set(ZINT_VERSION_RELEASE 0)
|
||||
set(ZINT_VERSION_BUILD 9) # Set to 0 before release, set to 9 after release
|
||||
set(ZINT_VERSION_BUILD 0) # 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}\")
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Version 2.15.0.9 (dev) not released yet (2025-12-09)
|
||||
====================================================
|
||||
Version 2.16.0 (2025-12-19)
|
||||
===========================
|
||||
|
||||
**Incompatible changes**
|
||||
------------------------
|
||||
@@ -21,6 +21,9 @@ Version 2.15.0.9 (dev) not released yet (2025-12-09)
|
||||
- UPC-E now returns warning if first digit of 7 digits ignored (not '0' or '1')
|
||||
- For GS1 Composite, no primary (linear component) now returns
|
||||
`ZINT_ERROR_INVALID_DATA` (previously returned `ZINT_ERROR_INVALID_OPTION`)
|
||||
- The distributed Windows binary "zint.exe" is now built with Microsoft Visual
|
||||
Studio 2015 and requires the Visual C runtime DLL "VCRUNTIME140.dll"
|
||||
(previously it was built with Visual Studio 6.0)
|
||||
|
||||
Changes
|
||||
-------
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
% README.bsd 2025-10-02
|
||||
% Tested on FreeBSD 14.3-RELEASE (with X11 + GNOME installed), OpenBSD 7.7 (with X11) and NetBSD 10.1 (with X11)
|
||||
% README.bsd 2025-12-17
|
||||
% Tested on FreeBSD 15.0-RELEASE (with X11 + GNOME installed), OpenBSD 7.8 (with X11) and NetBSD 10.1 (with X11)
|
||||
|
||||
1. Prerequisites for building zint
|
||||
==================================
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
% README.clang-tidy 2025-10-08
|
||||
% README.clang-tidy 2025-12-19
|
||||
% Current as of latest clang-tidy-22 via
|
||||
% wget https://apt.llvm.org/llvm.sh; chmod +x llvm.sh; sudo ./llvm.sh 22 all
|
||||
|
||||
@@ -11,7 +11,7 @@ clang-tidy-22 backend/*.c frontend/*.c backend_qt/*.cpp frontend_qt/*.cpp -p bui
|
||||
|
||||
For "backend_tcl", which has no "compile_commands.json", specify the tcl include directory and package define, e.g.
|
||||
|
||||
clang-tidy-22 backend_tcl/*.c -- -I/usr/include/tcl8.6 -DPACKAGE_VERSION='"2.15.0"'
|
||||
clang-tidy-22 backend_tcl/*.c -- -I/usr/include/tcl8.6 -DPACKAGE_VERSION='"2.16.0"'
|
||||
|
||||
Options are in ".clang-tidy" (in the project root directory). The excluded check is
|
||||
`clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling` (for `sprintf()`).
|
||||
|
||||
12
README.linux
@@ -1,6 +1,6 @@
|
||||
% README.linux 2025-10-02
|
||||
% README.linux 2025-12-15
|
||||
% Tested on Ubuntu 20.04.4 LTS, Ubuntu 22.04 LTS, Ubuntu 24.04 LTS and
|
||||
% Fedora Linux 42 (Workstation Edition)
|
||||
% Fedora Linux 43 (Workstation Edition)
|
||||
|
||||
1. Prerequisites for building zint
|
||||
==================================
|
||||
@@ -33,10 +33,10 @@ and navigate to "src/c-lib" and make:
|
||||
|
||||
Now either download the zint source code tarball
|
||||
|
||||
wget -O zint-2.15.0-src.tar.gz \
|
||||
https://sourceforge.net/projects/zint/files/zint/2.15.0/zint-2.15.0-src.tar.gz/download
|
||||
tar xf zint-2.15.0-src.tar.gz
|
||||
cd zint-2.15.0-src
|
||||
wget -O zint-2.16.0-src.tar.gz \
|
||||
https://sourceforge.net/projects/zint/files/zint/2.16.0/zint-2.16.0-src.tar.gz/download
|
||||
tar xf zint-2.16.0-src.tar.gz
|
||||
cd zint-2.16.0-src
|
||||
|
||||
or clone the latest source
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
# make clean cleans up a previous compilation and any object or editor files
|
||||
#
|
||||
|
||||
ZINT_VERSION:=-DZINT_VERSION=\"2.15.0.9\"
|
||||
ZINT_VERSION:=-DZINT_VERSION=\"2.16.0\"
|
||||
|
||||
|
||||
CC:= gcc
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include <windows.h>
|
||||
#include <winver.h>
|
||||
|
||||
#define VER_FILEVERSION 2,15,0,9
|
||||
#define VER_FILEVERSION_STR "2.15.0.9\0"
|
||||
#define VER_FILEVERSION 2,16,0,0
|
||||
#define VER_FILEVERSION_STR "2.16.0.0\0"
|
||||
|
||||
#ifdef GCC_WINDRES
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
|
||||
@@ -31,11 +31,11 @@
|
||||
/* SPDX-License-Identifier: BSD-3-Clause */
|
||||
|
||||
/*
|
||||
* Version: 2.15.0.9 (dev) (see "zintconfig.h")
|
||||
* Version: 2.16.0 (see "zintconfig.h")
|
||||
*
|
||||
* For documentation, see "../docs/manual.txt" or "../docs/manual.html" or the
|
||||
* PDF manual for 2.15.0 at
|
||||
* https://sourceforge.net/projects/zint/files/zint/2.15.0/manual.pdf/download
|
||||
* PDF manual for 2.16.0 at
|
||||
* https://sourceforge.net/projects/zint/files/zint/2.16.0/manual.pdf/download
|
||||
* or online at
|
||||
* https://zint.org.uk/manual/
|
||||
*/
|
||||
|
||||
@@ -35,9 +35,9 @@
|
||||
#define ZINTCONFIG_H
|
||||
|
||||
#define ZINT_VERSION_MAJOR 2
|
||||
#define ZINT_VERSION_MINOR 15
|
||||
#define ZINT_VERSION_MINOR 16
|
||||
#define ZINT_VERSION_RELEASE 0
|
||||
#define ZINT_VERSION_BUILD 9
|
||||
#define ZINT_VERSION_BUILD 0
|
||||
|
||||
/* vim: set ts=4 sw=4 et : */
|
||||
#endif /* ZINTCONFIG_H */
|
||||
|
||||
@@ -17,7 +17,7 @@ TARGET = QtZint
|
||||
INCLUDEPATH += ../backend
|
||||
|
||||
#EDIT THIS !!!!
|
||||
DEFINES += ZINT_VERSION="\\\"2.15.0.9\\\""
|
||||
DEFINES += ZINT_VERSION="\\\"2.16.0\\\""
|
||||
|
||||
INCLUDEPATH += ../../lpng
|
||||
INCLUDEPATH += ../../zlib
|
||||
@@ -127,7 +127,7 @@ SOURCES += ../backend/2of5.c \
|
||||
../backend/dllversion.c \
|
||||
qzint.cpp
|
||||
|
||||
VERSION = 2.15.0.9
|
||||
VERSION = 2.16.0
|
||||
|
||||
#DESTDIR = .
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ win32 {
|
||||
}
|
||||
|
||||
TARGET = QtZint2
|
||||
VERSION = 2.15.0.9
|
||||
VERSION = 2.16.0
|
||||
|
||||
QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305
|
||||
QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305
|
||||
|
||||
18
backend_tcl/configure
vendored
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.72 for zint 2.15.0.
|
||||
# Generated by GNU Autoconf 2.72 for zint 2.16.0.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
|
||||
@@ -601,8 +601,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='zint'
|
||||
PACKAGE_TARNAME='zint'
|
||||
PACKAGE_VERSION='2.15.0'
|
||||
PACKAGE_STRING='zint 2.15.0'
|
||||
PACKAGE_VERSION='2.16.0'
|
||||
PACKAGE_STRING='zint 2.16.0'
|
||||
PACKAGE_BUGREPORT=''
|
||||
PACKAGE_URL=''
|
||||
|
||||
@@ -1337,7 +1337,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
'configure' configures zint 2.15.0 to adapt to many kinds of systems.
|
||||
'configure' configures zint 2.16.0 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1399,7 +1399,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of zint 2.15.0:";;
|
||||
short | recursive ) echo "Configuration of zint 2.16.0:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1504,7 +1504,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
zint configure 2.15.0
|
||||
zint configure 2.16.0
|
||||
generated by GNU Autoconf 2.72
|
||||
|
||||
Copyright (C) 2023 Free Software Foundation, Inc.
|
||||
@@ -1811,7 +1811,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by zint $as_me 2.15.0, which was
|
||||
It was created by zint $as_me 2.16.0, which was
|
||||
generated by GNU Autoconf 2.72. Invocation command line was
|
||||
|
||||
$ $0$ac_configure_args_raw
|
||||
@@ -10125,7 +10125,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by zint $as_me 2.15.0, which was
|
||||
This file was extended by zint $as_me 2.16.0, which was
|
||||
generated by GNU Autoconf 2.72. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -10180,7 +10180,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config='$ac_cs_config_escaped'
|
||||
ac_cs_version="\\
|
||||
zint config.status 2.15.0
|
||||
zint config.status 2.16.0
|
||||
configured by $0, generated by GNU Autoconf 2.72,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ dnl to configure the system for the local environment.
|
||||
# so that we create the export library with the dll.
|
||||
#-----------------------------------------------------------------------
|
||||
|
||||
AC_INIT([zint],[2.15.0])
|
||||
AC_INIT([zint],[2.16.0])
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
package ifneeded zint 2.15.0\
|
||||
package ifneeded zint 2.16.0\
|
||||
[list load [file join $dir zint[info sharedlibextension]]]
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
2025-01-22
|
||||
2025-12-16
|
||||
(C) Harald Oehlmann
|
||||
harald.oehlmann@users.sourceforge.net
|
||||
|
||||
To build using nmake on Windows:
|
||||
|
||||
Download the tcl and tk 8.6.16 or 9.0.1 source from:
|
||||
Download the tcl and tk 8.6.17 or 9.0.3 source from:
|
||||
|
||||
https://sourceforge.net/projects/tcl/files/Tcl/
|
||||
|
||||
Unzip them into a folder (example: c:\temp)
|
||||
|
||||
In the following:
|
||||
<tcl> is c:\temp\tcl8.6.16 (or 9.0.1)
|
||||
<tk> is c:\temp\tk8.6.16 (or 9.0.1)
|
||||
<tcl> is c:\temp\tcl8.6.17 (or 9.0.3)
|
||||
<tk> is c:\temp\tk8.6.17 (or 9.0.3)
|
||||
<inst> is the Tcl/Tk install directory (example: c:\Tcl)
|
||||
<zint> is the Zint project root directory
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<AdditionalIncludeDirectories>..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.15.0.9";PACKAGE_VERSION="2.15.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.16.0";PACKAGE_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
|
||||
<BrowseInformation>true</BrowseInformation>
|
||||
<PrecompiledHeaderOutputFile>.\Debug\zint_tcl.pch</PrecompiledHeaderOutputFile>
|
||||
@@ -107,7 +107,7 @@
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<AdditionalIncludeDirectories>..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.15.0.9";PACKAGE_VERSION="2.15.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.16.0";PACKAGE_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AssemblerListingLocation>.\Release\</AssemblerListingLocation>
|
||||
<BrowseInformation>true</BrowseInformation>
|
||||
<PrecompiledHeaderOutputFile>.\Release\zint_tcl.pch</PrecompiledHeaderOutputFile>
|
||||
|
||||
|
Before Width: | Height: | Size: 337 KiB After Width: | Height: | Size: 325 KiB |
|
Before Width: | Height: | Size: 234 KiB After Width: | Height: | Size: 239 KiB |
|
Before Width: | Height: | Size: 215 KiB After Width: | Height: | Size: 209 KiB |
|
Before Width: | Height: | Size: 279 KiB After Width: | Height: | Size: 271 KiB |
|
Before Width: | Height: | Size: 240 KiB After Width: | Height: | Size: 232 KiB |
|
Before Width: | Height: | Size: 285 KiB After Width: | Height: | Size: 275 KiB |
@@ -4,7 +4,7 @@
|
||||
<meta charset="utf-8" />
|
||||
<meta name="generator" content="pandoc" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
|
||||
<meta name="author" content="Version 2.15.0.9" />
|
||||
<meta name="author" content="Version 2.16.0" />
|
||||
<title>Zint Barcode Generator and Zint Barcode Studio User Manual</title>
|
||||
<style>
|
||||
html {
|
||||
@@ -333,7 +333,7 @@
|
||||
<header id="title-block-header">
|
||||
<h1 class="title">Zint Barcode Generator and Zint Barcode Studio User
|
||||
Manual</h1>
|
||||
<p class="author">Version 2.15.0.9</p>
|
||||
<p class="author">Version 2.16.0</p>
|
||||
<p class="date">December 2025</p>
|
||||
</header>
|
||||
<nav id="TOC" role="doc-toc">
|
||||
@@ -978,6 +978,10 @@ Defender SmartScreen that this is an ‘unrecognised app’. This happens
|
||||
because Zint is a free and open-source software project with no
|
||||
advertising and hence no income, meaning we are not able to afford the
|
||||
$664 per year to have the application digitally signed by Microsoft.</p>
|
||||
<p>The distributed binaries are built with Microsoft Visual Studio 2015
|
||||
and both require the Visual C runtime DLL “VCRUNTIME140.dll”.
|
||||
<code>qtZint.exe</code> also requires the Visual C++ runtime DLL
|
||||
“MSVCP140.dll”.</p>
|
||||
<p>To build Zint on Windows from source, see
|
||||
<code>"win32/README"</code>.</p>
|
||||
<h2 id="apple-macos">2.4 Apple macOS</h2>
|
||||
@@ -8319,8 +8323,8 @@ remain the property of their respective owners and do not indicate
|
||||
endorsement or affiliation with those owners, companies or
|
||||
organisations.</p>
|
||||
<h2 id="version-information">7.3 Version Information</h2>
|
||||
<p>The current stable version of Zint is 2.15.0, released on 25th
|
||||
February 2025.</p>
|
||||
<p>The current stable version of Zint is 2.16.0, released on 19th
|
||||
December 2025.</p>
|
||||
<p>See <code>"ChangeLog"</code> in the project root directory for
|
||||
information on all releases.</p>
|
||||
<h2 id="sources-of-information">7.4 Sources of Information</h2>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
% Zint Barcode Generator and Zint Barcode Studio User Manual
|
||||
% Version 2.15.0.9
|
||||
% Version 2.16.0
|
||||
% December 2025
|
||||
|
||||
# 1. Introduction
|
||||
@@ -219,6 +219,10 @@ a free and open-source software project with no advertising and hence no income,
|
||||
meaning we are not able to afford the $664 per year to have the application
|
||||
digitally signed by Microsoft.
|
||||
|
||||
The distributed binaries are built with Microsoft Visual Studio 2015 and both
|
||||
require the Visual C runtime DLL "VCRUNTIME140.dll". `qtZint.exe` also requires
|
||||
the Visual C++ runtime DLL "MSVCP140.dll".
|
||||
|
||||
To build Zint on Windows from source, see `"win32/README"`.
|
||||
|
||||
## 2.4 Apple macOS
|
||||
@@ -5055,7 +5059,7 @@ those owners, companies or organisations.
|
||||
|
||||
## 7.3 Version Information
|
||||
|
||||
The current stable version of Zint is 2.15.0, released on 25th February 2025.
|
||||
The current stable version of Zint is 2.16.0, released on 19th December 2025.
|
||||
|
||||
See `"ChangeLog"` in the project root directory for information on all releases.
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Zint Barcode Generator and Zint Barcode Studio User Manual
|
||||
Version 2.15.0.9
|
||||
Version 2.16.0
|
||||
December 2025
|
||||
|
||||
*******************************************************************************
|
||||
@@ -400,6 +400,10 @@ free and open-source software project with no advertising and hence no income,
|
||||
meaning we are not able to afford the $664 per year to have the application
|
||||
digitally signed by Microsoft.
|
||||
|
||||
The distributed binaries are built with Microsoft Visual Studio 2015 and both
|
||||
require the Visual C runtime DLL “VCRUNTIME140.dll”. qtZint.exe also requires
|
||||
the Visual C++ runtime DLL “MSVCP140.dll”.
|
||||
|
||||
To build Zint on Windows from source, see "win32/README".
|
||||
|
||||
2.4 Apple macOS
|
||||
@@ -4849,7 +4853,7 @@ those owners, companies or organisations.
|
||||
|
||||
7.3 Version Information
|
||||
|
||||
The current stable version of Zint is 2.15.0, released on 25th February 2025.
|
||||
The current stable version of Zint is 2.16.0, released on 19th December 2025.
|
||||
|
||||
See "ChangeLog" in the project root directory for information on all releases.
|
||||
|
||||
@@ -5099,7 +5103,7 @@ configured barcode is updated when the "Generate" button is pressed.
|
||||
|
||||
Annex D. Man Page ZINT(1)
|
||||
|
||||
% ZINT(1) Version 2.15.0.9 % % December 2025
|
||||
% ZINT(1) Version 2.16.0 % % December 2025
|
||||
|
||||
NAME
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
.\" Automatically generated by Pandoc 3.8.3
|
||||
.\"
|
||||
.TH "ZINT" "1" "December 2025" "Version 2.15.0.9"
|
||||
.TH "ZINT" "1" "December 2025" "Version 2.16.0"
|
||||
.SH NAME
|
||||
\f[CR]zint\f[R] \- encode data as a barcode image
|
||||
.SH SYNOPSIS
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
% ZINT(1) Version 2.15.0.9
|
||||
% ZINT(1) Version 2.16.0
|
||||
%
|
||||
% December 2025
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
# make clean cleans up a previous compilation and any object or editor files
|
||||
#
|
||||
|
||||
ZINT_VERSION:=-DZINT_VERSION=\"2.15.0.9\"
|
||||
ZINT_VERSION:=-DZINT_VERSION=\"2.16.0\"
|
||||
|
||||
CC := gcc
|
||||
CFLAGS := -D_WIN32 -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include <windows.h>
|
||||
#include <winver.h>
|
||||
|
||||
#define VER_FILEVERSION 2,15,0,9
|
||||
#define VER_FILEVERSION_STR "2.15.0.9\0"
|
||||
#define VER_FILEVERSION 2,16,0,0
|
||||
#define VER_FILEVERSION_STR "2.16.0.0\0"
|
||||
|
||||
#ifdef GCC_WINDRES
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include <windows.h>
|
||||
#include <winver.h>
|
||||
|
||||
#define VER_FILEVERSION 2,15,0,9
|
||||
#define VER_FILEVERSION_STR "2.15.0.9\0"
|
||||
#define VER_FILEVERSION 2,16,0,0
|
||||
#define VER_FILEVERSION_STR "2.16.0.0\0"
|
||||
|
||||
#ifdef GCC_WINDRES
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
|
||||
@@ -213,6 +213,10 @@ if (!file_put_contents($file, implode("\n", $lines))) {
|
||||
|
||||
year_replace($data_dirname . 'README', $year);
|
||||
|
||||
// README.clang-tidy
|
||||
|
||||
version_replace(1, $data_dirname . 'README.clang-tidy', '/PACKAGE_VERSION/', '/"[0-9.]+"/', '"' . $v_base_str . '"');
|
||||
|
||||
// README.linux
|
||||
|
||||
version_replace(4, $data_dirname . 'README.linux', '/zint-[0-9]/', '/[0-9][0-9.]+/', $v_base_str);
|
||||
@@ -232,6 +236,7 @@ rc_replace($data_dirname . 'backend/libzint.rc', $rc_str1, $rc_str2, $year);
|
||||
// backend/zint.h
|
||||
|
||||
version_replace(1, $data_dirname . 'backend/zint.h', '/^ \* Version: /', '/[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?( \(dev\))?/', $v_str_dev);
|
||||
version_replace(2, $data_dirname . 'backend/zint.h', '/^ \* (PDF manual|https:\/\/sourceforge)/', '/[0-9]+\.[0-9]+\.[0-9]+/', $v_base_str);
|
||||
|
||||
// backend/zintconfig.h
|
||||
|
||||
@@ -370,6 +375,10 @@ version_replace(2, $data_dirname . 'win32/vs2019/libzint.vcxproj', '/ZINT_VERSIO
|
||||
|
||||
version_replace(2, $data_dirname . 'win32/vs2019/zint.vcxproj', '/ZINT_VERSION="/', '/ZINT_VERSION="[0-9.]+"/', 'ZINT_VERSION="' . $v_str . '"');
|
||||
|
||||
// win32/zint_dll_vc6/zint_dll_vc6.dsp
|
||||
|
||||
version_replace(3, $data_dirname . 'win32/zint_dll_vc6/zint_dll_vc6.dsp', '/ZINT_VERSION="/', '/ZINT_VERSION="[0-9.]+"/', 'ZINT_VERSION="' . $v_str . '"');
|
||||
|
||||
// Leaving auto-generated files:
|
||||
// backend_tcl/configure (PACKAGE_VERSION and PACKAGE_STRING) - generated by autoconf from configure.ac
|
||||
// frontend_qt/Inno_Setup_qtzint.iss (MyAppVersion)
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\zlib;..\..\lpng;..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<ExceptionHandling />
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -91,7 +91,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<IntrinsicFunctions>false</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>..\..\zlib;..\..\lpng;..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\lpng;..\..\..\zlib"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.15.0.9\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.16.0\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG"
|
||||
MinimalRebuild="true"
|
||||
ExceptionHandling="0"
|
||||
BasicRuntimeChecks="3"
|
||||
@@ -127,7 +127,7 @@
|
||||
Optimization="2"
|
||||
EnableIntrinsicFunctions="false"
|
||||
AdditionalIncludeDirectories="..\..\..\lpng;..\..\..\zlib"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.15.0.9\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.16.0\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="0"
|
||||
RuntimeLibrary="2"
|
||||
|
||||
@@ -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.15.0.9\"";ZINT_DLL"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.16.0\"";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.15.0.9\"";ZINT_DLL"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.16.0\"";ZINT_DLL"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="0"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
@@ -117,7 +117,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<ExceptionHandling />
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -149,7 +149,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ExceptionHandling>
|
||||
</ExceptionHandling>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -182,7 +182,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<IntrinsicFunctions>false</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@@ -215,7 +215,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<IntrinsicFunctions>false</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>
|
||||
</ExceptionHandling>
|
||||
@@ -250,10 +250,10 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<IntrinsicFunctions>false</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<FunctionLevelLinking>false</FunctionLevelLinking>
|
||||
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
||||
<PrecompiledHeader />
|
||||
@@ -265,7 +265,9 @@
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ResourceCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)libzintMD.lib</OutputFile>
|
||||
<OutputFile>$(OutDir)libzint.lib</OutputFile>
|
||||
<AdditionalDependencies>zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_LIB|x64'">
|
||||
@@ -273,7 +275,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<IntrinsicFunctions>false</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>
|
||||
</ExceptionHandling>
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<ExceptionHandling />
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -127,7 +127,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ExceptionHandling>
|
||||
</ExceptionHandling>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -147,7 +147,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
@@ -165,7 +165,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>
|
||||
</ExceptionHandling>
|
||||
@@ -186,7 +186,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@@ -204,7 +204,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>
|
||||
</ExceptionHandling>
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<ExceptionHandling />
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -91,7 +91,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<IntrinsicFunctions>false</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<ExceptionHandling />
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -72,7 +72,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<ExceptionHandling />
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -91,7 +91,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<IntrinsicFunctions>false</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<ExceptionHandling />
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -72,7 +72,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<ExceptionHandling />
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -72,7 +72,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
|
||||
@@ -30,8 +30,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
|
||||
// Version
|
||||
//
|
||||
|
||||
#define VER_FILEVERSION 2,15,0,9
|
||||
#define VER_FILEVERSION_STR "2.15.0.9\0"
|
||||
#define VER_FILEVERSION 2,16,0,0
|
||||
#define VER_FILEVERSION_STR "2.16.0.0\0"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION VER_FILEVERSION
|
||||
|
||||
@@ -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.15.0.9\"" /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.16.0\"" /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" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ZINT_NO_PNG" /D "DEBUG" /YX /FD /GZ /D ZINT_VERSION="\"2.15.0.9\"" /c
|
||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\backend" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ZINT_NO_PNG" /D "DEBUG" /YX /FD /GZ /D ZINT_VERSION="\"2.16.0\"" /c
|
||||
# ADD BASE RSC /l 0x407 /d "_DEBUG"
|
||||
# ADD RSC /l 0x407 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
|
||||
@@ -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_DLL_VC6_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "NDEBUG" /D ZINT_VERSION="2.15.0" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_DLL_VC6_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "NDEBUG" /D ZINT_VERSION="2.16.0" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_DLL_VC6_EXPORTS" /YX /FD /c
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x1809 /d "NDEBUG"
|
||||
@@ -69,7 +69,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_DLL_VC6_EXPORTS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_DLL_VC6_EXPORTS" /D ZINT_VERSION="2.15.0" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_DLL_VC6_EXPORTS" /D ZINT_VERSION="2.16.0" /YX /FD /GZ /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x1809 /d "_DEBUG"
|
||||
@@ -174,7 +174,7 @@ SOURCE=..\..\backend\dmatrix.c
|
||||
|
||||
!ELSEIF "$(CFG)" == "zint_dll_vc6 - Win32 Debug"
|
||||
|
||||
# ADD CPP /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D ZINT_VERSION="2.15.0"
|
||||
# ADD CPP /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D ZINT_VERSION="2.16.0"
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
||||
2
zint.nsi
@@ -10,7 +10,7 @@
|
||||
;******************************************************************************
|
||||
!define PRODUCT_NAME "Zint"
|
||||
!define PRODUCT_EXE "qtZint.exe"
|
||||
!define PRODUCT_VERSION "2.15.0.9"
|
||||
!define PRODUCT_VERSION "2.16.0"
|
||||
!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}"
|
||||
|
||||