win32: update README, changing Visual Studio example from

2017 -> 2022 (2017 moved to "vs2017") and simplifying lpng
  build (use "nmake" - "libpng16_static.lib" -> "libpng.lib");
  update various ".sln", ".vcxproj" & "*.pro" files
update_version.php: update copyright year also in "*.rc" files
manual: note Ultracode 2023 now released but not yet supported

docs/manual.html

@@ -7907,13 +7907,11 @@ this can be initiated through the API by setting</p>
 class="sourceCode c"><code class="sourceCode c"><span id="cb117-1"><a href="#cb117-1" aria-hidden="true" tabindex="-1"></a>symbol<span class="op">-&gt;</span>option_3 <span class="op">=</span> ULTRA_COMPRESSION<span class="op">;</span></span></code></pre></div>
 <p>With compression, up to 504 digits, 375 alphanumerics or 252 bytes
 can be encoded.</p>
-<p>Revision 2 of Ultracode (2023) which swops and inverts the DCCU and
+<p>Revision 2 of Ultracode (2023) may be specified using
-DCCL tiles may be specified using <code>--vers=2</code> (API
+<code>--vers=2</code> (API <code>option_2 = 2</code>).</p>
-<code>option_2 = 2</code>).</p>
 <hr />
-<p>WARNING: Revision 2 of Ultracode is currently (December 2023)
+<p>WARNING: Revision 2 of Ultracode was only finalized December 2023 and
-undergoing major modifications, yet to be finalized, and should not be
+Zint has not yet been updated to support it. Do not use.</p>
-used in a production environment.</p>
 <hr />
 <p>Ultracode supports Structured Append of up to 8 symbols and an
 optional numeric ID (File Number), which can be set by using the

docs/manual.pmd

@@ -4602,13 +4602,12 @@ symbol->option_3 = ULTRA_COMPRESSION;
 With compression, up to 504 digits, 375 alphanumerics or 252 bytes can be
 encoded.
 
-Revision 2 of Ultracode (2023) which swops and inverts the DCCU and DCCL tiles
+Revision 2 of Ultracode (2023) may be specified using `--vers=2` (API
-may be specified using `--vers=2` (API `option_2 = 2`).
+`option_2 = 2`).
 
 * * *
-WARNING: Revision 2 of Ultracode is currently (December 2023) undergoing major
+WARNING: Revision 2 of Ultracode was only finalized December 2023 and Zint has
-modifications, yet to be finalized, and should not be used in a production
+not yet been updated to support it. Do not use.
-environment.
 
 * * *
 

docs/manual.txt

@@ -4427,14 +4427,13 @@ initiated through the API by setting
 With compression, up to 504 digits, 375 alphanumerics or 252 bytes can be
 encoded.
 
-Revision 2 of Ultracode (2023) which swops and inverts the DCCU and DCCL tiles
+Revision 2 of Ultracode (2023) may be specified using --vers=2 (API
-may be specified using --vers=2 (API option_2 = 2).
+option_2 = 2).
 
 --------------------------------------------------------------------------------
 
-WARNING: Revision 2 of Ultracode is currently (December 2023) undergoing major
+WARNING: Revision 2 of Ultracode was only finalized December 2023 and Zint has
-modifications, yet to be finalized, and should not be used in a production
+not yet been updated to support it. Do not use.
-environment.
 
 --------------------------------------------------------------------------------
 

frontend_qt/frontend_qt.pro

@@ -89,8 +89,8 @@ QMAKE_LIBDIR += C:/qt/5.15.2static/lib
 
 !contains(DEFINES, ZINT_NO_PNG) {
 # Win
-    win32:LIBS += -llibpng16 -lzlib
+    win32:LIBS += -llibpng -lzlib
-    win32:QMAKE_LIBDIR+="../../lpng/projects/vstudio/Release Library"
+    win32:QMAKE_LIBDIR+=../../lpng/ ../../zlib
 # Unix
     #unix:LIBS += -lpng -zlib
     #unix:QMAKE_LIBDIR += /usr/local/lib /usr/lib/x86_64-linux-gnu/

frontend_qt/howto_build_qzint_using_msvs2015.txt

@@ -15,57 +15,61 @@ Build static Qt:
 
 - Start the VS2015 x86 native console by the start menu entry:
   Visual Studio 2015\Visual Studio Tools\Windows Desktop Command Prompts\VS2015 x86 Native Tools-Eingabeaufforderung
-  ("Eingabeaufforderung" = "Command Prompt")
+- ("Eingabeaufforderung" = "Command Prompt")
 
-Note: if "rc.exe" not available, install a Windows Kit and update PATH (e.g.):
+- Note: if "rc.exe" not available, install a Windows Kit and update PATH (e.g.):
-- set "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86;%PATH%"
+  set "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.20348.0\x86;%PATH%"
 
-- cd C:\qt\qt-everywhere-src-5.15.2
+  cd C:\qt\qt-everywhere-src-5.15.2
-- configure.bat -static -release -prefix c:\qt\5.15.2static -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -qt-freetype -opengl desktop -no-openssl -opensource -confirm-license -make libs -nomake tools -nomake examples -nomake tests -mp
+  configure.bat -static -release -prefix c:\qt\5.15.2static -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -qt-freetype -opengl desktop -no-openssl -opensource -confirm-license -make libs -nomake tools -nomake examples -nomake tests -mp
-  One may set another destination folder after the -prefix option.
+- One may set another destination folder after the -prefix option.
-  Attention, the upper command is one long line.
+- Attention, the upper command is one long line.
-- nmake
+  nmake
-- nmake install
+  nmake install
-  The last 3 commands run around 3 hours.
+- The last 3 commands run around 3 hours.
-  Make sure, that python may be found in the path.
+- Make sure, that python may be found in the path.
 - the huge source folder may be deleted to save around 6GB of space.
 
 Zint Folder structure:
 ----------------------
-- zint source files in $ZH
+- zint source files in %ZH%, e.g.
-  -> this file is in $ZH\frontend_qt
+  set "ZH=%cd%\zint"
-- png1620.zip unzipped in $ZH\..\lpng
+  git clone https://git.code.sf.net/p/zint/code "%ZH%"
-  -> $ZH\..\lpng\png.h exists
+-> this file is in %ZH%\frontend_qt
-- zlib128.zip unzipped in folder $ZH\..\zlib
+
-  -> $ZH\..\zlib\zlib.h exists
+- libpng source files in %ZH%\..\lpng
+  git clone https://git.code.sf.net/p/libpng/code "%ZH%\..\lpng"
+-> %ZH%\..\lpng\png.h exists
+
+- zlib source files in %ZH%\..\zlib
+  git clone https://github.com/madler/zlib.git "%ZH%\..\zlib"
+-> %ZH%\..\zlib\zlib.h exists
 
 Build libpng:
 -------------
-Open $ZH\..\lpng\projects\vstudio with VS2015 gui and convert the project
+  cd "%ZH%\..\zlib"
-Set Project settings->C++->Code Generation->Library: Multi-Threadded DLL /MD
+  nmake -f win32\Makefile.msc clean
-Copy the zlib source as required by the make file (in my case: zlib-1.2.8)
+  nmake -f win32\Makefile.msc
-Build targets "Release Library" for zlib and libpng.
+  cd ..\lpng
+  nmake -f scripts\makefile.vcwin32 clean
+  nmake -f scripts\makefile.vcwin32
 
 Build zint:
 -----------
-- Start in the start menu: "VS2015 x86 Native Tools-Eingabeaufforderung"
+  set QTDIR=C:\Qt\5.15.2static
-- set QTDIR=C:\Qt\5.15.2static
+  set PATH=C:\Qt\5.15.2static\bin;%PATH%
-- set PATH=C:\Qt\5.15.2static\bin;%PATH%
+  set QMAKESPEC=win32-msvc
-- set QMAKESPEC=win32-msvc
+  cd "%ZH%"
-- cd $ZH
 
-Note: if "rc.exe" not available, install a Windows Kit and update PATH (e.g.):
+  cd backend_qt
-- set "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86;%PATH%"
+  qmake backend_qt.pro
+  nmake clean
+  nmake release
 
-- cd backend_qt
+  cd ..\frontend_qt
-- qmake backend_qt.pro
+  qmake frontend_qt.pro
-- nmake clean
+  nmake clean
-- nmake release
+  nmake release
-
-- cd ..\frontend_qt
-- qmake frontend_qt.pro
-- nmake clean
-- nmake release
 -> qtZint.exe is in the release folder
 
 Note:

tools/update_version.php

@@ -2,7 +2,7 @@
 /* Update Zint version number in various files */
 /*
     libzint - the open source barcode library
-    Copyright (C) 2020-2022 Robin Stuart <rstuart114@gmail.com>
+    Copyright (C) 2020-2023 Robin Stuart <rstuart114@gmail.com>
 */
 /* SPDX-License-Identifier: BSD-3-Clause */
 
@@ -52,6 +52,8 @@ if ($build) {
 $rc_str1 = "$major,$minor,$release,$build";
 $rc_str2 = "$major.$minor.$release.$build";
 
+$year = date("Y");
+
 /* `$to_do` is no. of lines that should get replaced/changed, not no. of replacements */
 function version_replace($to_do, $file, $match_pattern, $replace_pattern, $replace_str) {
     global $basename;
@@ -83,7 +85,7 @@ function version_replace($to_do, $file, $match_pattern, $replace_pattern, $repla
     }
 }
 
-function rc_replace($file, $rc_str1, $rc_str2) {
+function rc_replace($file, $rc_str1, $rc_str2, $year = '') {
     global $basename;
 
     if (($get = file_get_contents($file)) === false) {
@@ -117,6 +119,24 @@ function rc_replace($file, $rc_str1, $rc_str2) {
     if ($done !== 2) {
         exit("$basename: ERROR: Only did $done replacements of 2 in file \"$file\"" . PHP_EOL);
     }
+    if ($year !== '') {
+        $match_pattern = '/VALUE[ \t]+"LegalCopyright",[ \t]+"Copyright /';
+        $done = 0;
+        foreach ($lines as $li => $line) {
+            if (preg_match($match_pattern, $line)) {
+                $cnt = 0;
+                $lines[$li] = preg_replace('/[0-9]+/', $year, $line, 1, $cnt);
+                if ($cnt === 0 || $lines[$li] === NULL) {
+                    exit("$basename: ERROR: Could not replace \"$match_pattern\" in file \"$file\"" . PHP_EOL);
+                }
+                $done++;
+                break;
+            }
+        }
+        if ($done !== 1) {
+            exit("$basename: ERROR: Failed to replace Copyright year in file \"$file\"" . PHP_EOL);
+        }
+    }
     if (!file_put_contents($file, implode("\n", $lines))) {
         exit("$basename: ERROR: Could not write file \"$file\"" . PHP_EOL);
     }
@@ -167,7 +187,7 @@ version_replace(1, $data_dirname . 'zint.nsi', '/^!define +PRODUCT_VERSION/', '/
 
 // backend/libzint.rc
 
-rc_replace($data_dirname . 'backend/libzint.rc', $rc_str1, $rc_str2);
+rc_replace($data_dirname . 'backend/libzint.rc', $rc_str1, $rc_str2, $year);
 
 // backend/zintconfig.h
 
@@ -225,7 +245,7 @@ version_replace(1, $data_dirname . 'backend_tcl/lib/zint/pkgIndex.tcl', '/zint /
 
 // frontend/zint.rc
 
-rc_replace($data_dirname . 'frontend/zint.rc', $rc_str1, $rc_str2);
+rc_replace($data_dirname . 'frontend/zint.rc', $rc_str1, $rc_str2, $year);
 
 // frontend/Makefile.mingw
 
@@ -253,7 +273,7 @@ version_replace(1, $data_dirname . 'docs/zint.1.pmd', '/^% ZINT\(1\) Version /',
 
 // frontend_qt/res/qtZint.rc
 
-rc_replace($data_dirname . 'frontend_qt/res/qtZint.rc', $rc_str1, $rc_str2);
+rc_replace($data_dirname . 'frontend_qt/res/qtZint.rc', $rc_str1, $rc_str2, $year);
 
 // win32/libzint.vcxproj
 
@@ -265,7 +285,7 @@ version_replace(2, $data_dirname . 'win32/zint.vcxproj', '/ZINT_VERSION="/', '/Z
 
 // win32/zint_cmdline_vc6/zint.rc
 
-rc_replace($data_dirname . 'win32/zint_cmdline_vc6/zint.rc', $rc_str1, $rc_str2);
+rc_replace($data_dirname . 'win32/zint_cmdline_vc6/zint.rc', $rc_str1, $rc_str2, $year);
 
 // win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp
 
@@ -291,6 +311,14 @@ version_replace(6, $data_dirname . 'win32/vs2015/zint.vcxproj', '/ZINT_VERSION="
 
 version_replace(1, $data_dirname . 'win32/vs2015/vsx/libzintMD.vcxproj', '/ZINT_VERSION="/', '/ZINT_VERSION="[0-9.]+"/', 'ZINT_VERSION="' . $v_str . '"');
 
+// win32/vs2017/libzint.vcxproj
+
+version_replace(2, $data_dirname . 'win32/vs2017/libzint.vcxproj', '/ZINT_VERSION="/', '/ZINT_VERSION="[0-9.]+"/', 'ZINT_VERSION="' . $v_str . '"');
+
+// win32/vs2017/zint.vcxproj
+
+version_replace(2, $data_dirname . 'win32/vs2017/zint.vcxproj', '/ZINT_VERSION="/', '/ZINT_VERSION="[0-9.]+"/', 'ZINT_VERSION="' . $v_str . '"');
+
 // win32/vs2019/libzint.vcxproj
 
 version_replace(2, $data_dirname . 'win32/vs2019/libzint.vcxproj', '/ZINT_VERSION="/', '/ZINT_VERSION="[0-9.]+"/', 'ZINT_VERSION="' . $v_str . '"');

win32/README

@@ -1,4 +1,4 @@
-Visual Studio 2017
+Visual Studio 2022
 ------------------
 
 To build the Zint library DLL and the command line tool "zint.exe" with PNG
@@ -7,8 +7,8 @@ support for x86/Win32:
 Install git (https://git-scm.com/downloads)
 Install cmake (https://cmake.org/download/)
 
-Open a "Developer Command Prompt for VS 2017" (should be available under the
+Open a "Developer Command Prompt for VS 2022" (should be available under the
-"Visual Studio 2017" tab in the Start menu).
+"Visual Studio 2022" tab in the Start menu).
 
 Make sure git and cmake are in your PATH, e.g. (your paths may differ)
 
@@ -29,25 +29,18 @@ and cloning each:
 First build zlib:
 
   cd zlib
-
   nmake -f win32\Makefile.msc clean
   nmake -f win32\Makefile.msc
-
   cd ..
 
 and then lpng:
 
   cd lpng
-
+  nmake -f scripts\makefile.vcwin32 clean
-  cmake -G "Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=Release^
+  nmake -f scripts\makefile.vcwin32
-        -DPNG_BUILD_ZLIB=ON -DZLIB_INCLUDE_DIRS=..\zlib^
-        -DPNG_STATIC=ON -DPNG_SHARED=OFF -B build
-
-  cmake --build build --config Release
-
   cd ..
 
-If you now open "%cd%\zint\win32\zint.sln" with Visual Studio 2017, you
+If you now open "%cd%\zint\win32\zint.sln" with Visual Studio 2022, you
 should be able to build the Release configuration for Win32.
 
 "zint.dll" and "zint.exe" will be in "zint\win32\Release".
@@ -58,32 +51,28 @@ involves signing up for a Qt account and installing the Qt Maintenance Tool.
 Using this tool you can install various versions of Qt and various optional
 components.
 
-The following requires the "MSVC 2017 32-bit" component to be installed.
+The following requires the "MSVC 2019 32-bit" component to be installed.
 
-As of writing Qt 5.14.2 is the latest release that includes this component and
+As of writing Qt 5.15.2 is the latest release that includes this component and
 is used here. Add the location of this component to your PATH, e.g. (your path
 may differ):
 
-  set "PATH=C:\Qt\5.14.2\msvc2017\bin;%PATH%"
+  set "PATH=C:\Qt\5.15.2\msvc2019\bin;%PATH%"
 
 Next build the Zint backend Qt library "QtZintDLL.lib":
 
   cd zint\backend_qt
-
   qmake backend_qt_zintdll.pro
   nmake clean
   nmake release
-
   cd ..\..
 
 Then Zint Studio "qtZint.exe":
 
   cd zint\frontend_qt
-
   qmake frontend_qt_zintdll.pro
   nmake clean
   nmake release
-
   cd ..\..
 
 This creates "zint\frontend_qt\release\qtZint.exe". It requires the Zint DLL to
@@ -96,40 +85,25 @@ You should now be able to run Zint Studio:
   zint\frontend_qt\release\qtZint
 
 
-Visual Studio 2019
+Visual Studio 2019 and 2017
-------------------
+---------------------------
 
-A solution for Visual Studio 2019 is in sub-directory vs2019. The steps are the
+Solutions for Visual Studio 2019 and 2017 are in sub-directories vs2019 and
-same as for Visual Studio 2017. To build lpng use
+vs2017. The steps are the same as for Visual Studio 2022.
-
-  cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_BUILD_TYPE=Release^
-        -DPNG_BUILD_ZLIB=ON -DZLIB_INCLUDE_DIRS=..\zlib^
-        -DPNG_STATIC=ON -DPNG_SHARED=OFF -B build
-
-(note the extra argument "-A Win32"). For Qt, the latest Qt5 version as of
-writing to support Visual Studio 2019 is 15.5.2. Install this and the
-"MSVC 2019 32-bit" component. Zint Studio can also be built using Qt6.
 
 
 Visual Studio 2015
 ------------------
 
-The solution and project files for Visual Studio 2015 have been moved to the
+A solution for Visual Studio 2015 is in sub-directory vs2015. The steps are
-sub-directory vs2015. The steps are almost the same as for Visual Studio 2017,
+almost the same as for Visual Studio 2022, except that "rc.exe" may not be
-except that "rc.exe" may not be available. If so, you need to install a Windows
+available. If so, you need to install a Windows Kit and then update your PATH,
-Kit and then update your PATH, e.g. (adjust for version):
+e.g. (adjust for version):
 
-  set "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86;%PATH%"
+  set "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.20348.0\x86;%PATH%"
-
-To build lpng use
-
-  cmake -G "Visual Studio 14 2015" -DCMAKE_BUILD_TYPE=Release^
-        -DPNG_BUILD_ZLIB=ON -DZLIB_INCLUDE_DIRS=..\zlib^
-        -DPNG_STATIC=ON -DPNG_SHARED=OFF -B build
 
 Recent versions of Qt no longer supply a specific component for Visual Studio
-2015 32-bit, but you can use "MSVC 2017 32-bit" or "MSVC 2019 32-bit" instead as
+2015 32-bit, but you can use "MSVC 2019 32-bit" instead as it's compatible.
-they're compatible.
 
 For information on building a standalone version of Zint Studio using Visual
 Studio 2015, see "frontend_qt\howto_build_qzint_using_msvs2015.txt"
@@ -141,23 +115,7 @@ CMake and Visual Studio
 Zint can also be built using CMake with Visual Studio 2022, 2019, 2017 or 2015.
 The following example uses Visual Studio 2019 to build for x86/Win32:
 
-As above, cd <project-directory> and clone lpng, zlib and zint into it. Then
+As above, follow the steps to build zlib and lpng.
-
-  cd zlib
-  ml /safeseh /coff /c contrib/masmx86/match686.asm
-  ml /safeseh /coff /c contrib/masmx86/inffas32.asm
-  nmake -f win32\Makefile.msc LOC="-DASMV -DASMINF=" OBJA="inffas32.obj match686.obj"
-  cd ..
-
-(compiling the zlib assembler with "SAFESEH" seems to be required when building
-zint using CMake)
-
-  cd lpng
-  cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_BUILD_TYPE=Release^
-        -DPNG_BUILD_ZLIB=ON -DZLIB_INCLUDE_DIRS=..\zlib^
-        -DPNG_STATIC=ON -DPNG_SHARED=OFF -B build
-  cmake --build build --config Release
-  cd ..
 
 CMake needs to be able to find zlib and lpng. One way to do this (requires
 Administrator privileges) is to create two sub-directories in
@@ -166,10 +124,7 @@ Administrator privileges) is to create two sub-directories in
   "zlib\zlib.h", "zlib\zconf.h", "lpng\png.h", "lpng\pngconf.h" and
   "lpng\pnglibconf.h" into "include", and
 
-  "zlib\zlib.lib" and "lpng\build\Release\libpng16_static.lib" into "lib".
+  "zlib\zlib.lib" and "lpng\libpng.lib" into "lib".
-
-You may need to rename "libpng16_static.lib" to "libpng.lib" depending on the
-version of cmake you have.
 
 This example uses Qt 5.15.2 and component "MSVC 2019 32-bit" so install them and
 add to path (your path may differ):

win32/libzint.vcxproj

@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5C08DC40-8F7D-475E-AA3C-814DED735A4B}</ProjectGuid>
-    <RootNamespace>libzint_png_qr</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="SetWindowsTargetPlatformVersion.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-    <TargetName>zint</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>zint</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\zlib\;..\..\lpng\;..\..\lpng\build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling />
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <SmallerTypeCheck>true</SmallerTypeCheck>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4018;4244;4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>libpng16_static.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zint.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lpng\build\Release;..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\zlib\;..\..\lpng\;..\..\lpng\build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling />
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
-      <DisableSpecificWarnings>4018;4244;4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>libpng16_static.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zint.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lpng\build\Release;..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\backend\2of5.c" />
-    <ClCompile Include="..\backend\auspost.c" />
-    <ClCompile Include="..\backend\aztec.c" />
-    <ClCompile Include="..\backend\bc412.c" />
-    <ClCompile Include="..\backend\bmp.c" />
-    <ClCompile Include="..\backend\codablock.c" />
-    <ClCompile Include="..\backend\code.c" />
-    <ClCompile Include="..\backend\code1.c" />
-    <ClCompile Include="..\backend\code128.c" />
-    <ClCompile Include="..\backend\code16k.c" />
-    <ClCompile Include="..\backend\code49.c" />
-    <ClCompile Include="..\backend\common.c" />
-    <ClCompile Include="..\backend\composite.c" />
-    <ClCompile Include="..\backend\dllversion.c" />
-    <ClCompile Include="..\backend\dmatrix.c" />
-    <ClCompile Include="..\backend\dotcode.c" />
-    <ClCompile Include="..\backend\eci.c" />
-    <ClCompile Include="..\backend\emf.c" />
-    <ClCompile Include="..\backend\general_field.c" />
-    <ClCompile Include="..\backend\gif.c" />
-    <ClCompile Include="..\backend\gridmtx.c" />
-    <ClCompile Include="..\backend\gs1.c" />
-    <ClCompile Include="..\backend\hanxin.c" />
-    <ClCompile Include="..\backend\imail.c" />
-    <ClCompile Include="..\backend\large.c" />
-    <ClCompile Include="..\backend\library.c" />
-    <ClCompile Include="..\backend\mailmark.c" />
-    <ClCompile Include="..\backend\maxicode.c" />
-    <ClCompile Include="..\backend\medical.c" />
-    <ClCompile Include="..\backend\output.c" />
-    <ClCompile Include="..\backend\pcx.c" />
-    <ClCompile Include="..\backend\pdf417.c" />
-    <ClCompile Include="..\backend\plessey.c" />
-    <ClCompile Include="..\backend\png.c" />
-    <ClCompile Include="..\backend\postal.c" />
-    <ClCompile Include="..\backend\ps.c" />
-    <ClCompile Include="..\backend\qr.c" />
-    <ClCompile Include="..\backend\raster.c" />
-    <ClCompile Include="..\backend\reedsol.c" />
-    <ClCompile Include="..\backend\rss.c" />
-    <ClCompile Include="..\backend\svg.c" />
-    <ClCompile Include="..\backend\telepen.c" />
-    <ClCompile Include="..\backend\tif.c" />
-    <ClCompile Include="..\backend\ultra.c" />
-    <ClCompile Include="..\backend\upcean.c" />
-    <ClCompile Include="..\backend\vector.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\backend\aztec.h" />
-    <ClInclude Include="..\backend\big5.h" />
-    <ClInclude Include="..\backend\bmp.h" />
-    <ClInclude Include="..\backend\channel_precalcs.h" />
-    <ClInclude Include="..\backend\code1.h" />
-    <ClInclude Include="..\backend\code128.h" />
-    <ClInclude Include="..\backend\code49.h" />
-    <ClInclude Include="..\backend\common.h" />
-    <ClInclude Include="..\backend\composite.h" />
-    <ClInclude Include="..\backend\dmatrix.h" />
-    <ClInclude Include="..\backend\dmatrix_trace.h" />
-    <ClInclude Include="..\backend\eci.h" />
-    <ClInclude Include="..\backend\eci_sb.h" />
-    <ClInclude Include="..\backend\emf.h" />
-    <ClInclude Include="..\backend\raster_font.h" />
-    <ClInclude Include="..\backend\gb18030.h" />
-    <ClInclude Include="..\backend\gb2312.h" />
-    <ClInclude Include="..\backend\gbk.h" />
-    <ClInclude Include="..\backend\general_field.h" />
-    <ClInclude Include="..\backend\gridmtx.h" />
-    <ClInclude Include="..\backend\gs1.h" />
-    <ClInclude Include="..\backend\gs1_lint.h" />
-    <ClInclude Include="..\backend\hanxin.h" />
-    <ClInclude Include="..\backend\iso3166.h" />
-    <ClInclude Include="..\backend\iso4217.h" />
-    <ClInclude Include="..\backend\ksx1001.h" />
-    <ClInclude Include="..\backend\large.h" />
-    <ClInclude Include="..\backend\maxicode.h" />
-    <ClInclude Include="..\backend\output.h" />
-    <ClInclude Include="..\backend\pcx.h" />
-    <ClInclude Include="..\backend\pdf417.h" />
-    <ClInclude Include="..\backend\pdf417_tabs.h" />
-    <ClInclude Include="..\backend\pdf417_trace.h" />
-    <ClInclude Include="..\backend\qr.h" />
-    <ClInclude Include="..\backend\reedsol.h" />
-    <ClInclude Include="..\backend\reedsol_logs.h" />
-    <ClInclude Include="..\backend\rss.h" />
-    <ClInclude Include="..\backend\sjis.h" />
-    <ClInclude Include="..\backend\tif.h" />
-    <ClInclude Include="..\backend\tif_lzw.h" />
-    <ClInclude Include="..\backend\zfiletypes.h" />
-    <ClInclude Include="..\backend\zint.h" />
-    <ClInclude Include="..\backend\zintconfig.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\backend\libzint.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

win32/vs2008/libzint.vcproj

@@ -68,10 +68,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libpng16_static.lib zlib.lib"
+				AdditionalDependencies="libpng.lib zlib.lib"
 				OutputFile="$(OutDir)\zintd.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\lpng\build\Release;..\..\..\zlib"
+				AdditionalLibraryDirectories="..\..\..\lpng;..\..\..\zlib"
 				IgnoreDefaultLibraryNames="libcmtd.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -152,10 +152,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="libpng16_static.lib zlib.lib"
+				AdditionalDependencies="libpng.lib zlib.lib"
 				OutputFile="$(OutDir)\zint.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\lpng\build\Release;..\..\..\zlib"
+				AdditionalLibraryDirectories="..\..\..\lpng;..\..\..\zlib"
 				GenerateDebugInformation="false"
 				SubSystem="2"
 				OptimizeReferences="2"

win32/vs2015/libzint.vcxproj

@@ -116,7 +116,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";ZINT_NO_PNG;BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <ExceptionHandling />
@@ -138,7 +138,7 @@
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zintd.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -148,7 +148,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZINT_NO_PNG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -171,7 +171,7 @@
     <Link>
       <AdditionalDependencies>zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zintd.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -181,7 +181,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;ZINT_NO_PNG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling />
@@ -200,9 +200,9 @@
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <Link>
-      <AdditionalDependencies>libpng16_static.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libpng.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zint.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -214,7 +214,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;ZINT_NO_PNG;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -236,9 +236,9 @@
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <Link>
-      <AdditionalDependencies>libpng16_static.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libpng.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zint.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -249,7 +249,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling />
@@ -272,7 +272,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>

win32/vs2015/zint.vcxproj

@@ -158,7 +158,7 @@
       <DebugInformationFormat />
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>..\..\..\lpng\build\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -179,7 +179,7 @@
       </DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>..\..\..\lpng\build\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'">
@@ -197,8 +197,7 @@
       <DebugInformationFormat />
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libpngMD.lib;zlibMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libpng.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>d:\opt\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_LIB|x64'">
@@ -219,8 +218,7 @@
       </DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libpngMD.lib;zlibMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libpng.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>d:\opt\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

win32/vs2017/libzint.vcxproj

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release_LIB|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Release_LIB</Configuration>
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -11,60 +15,110 @@
     <RootNamespace>libzint_png_qr</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
+  <Import Project="SetWindowsTargetPlatformVersion.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'">$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'">libzintMD</TargetName>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>zint</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>zint</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <ExceptionHandling />
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <SmallerTypeCheck>true</SmallerTypeCheck>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4018;4244;4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>libpng.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)zint.dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>d:\opt1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";ZINT_NO_PNG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>
+      <ExceptionHandling />
-      </ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
+      <PrecompiledHeader />
-      </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
+      <DebugInformationFormat />
-      </DebugInformationFormat>
       <DisableSpecificWarnings>4018;4244;4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderFile>
-      </PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
-    <Lib>
+    <ProjectReference>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>libpng.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)zint.dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\backend\2of5.c" />
@@ -80,9 +134,7 @@
     <ClCompile Include="..\..\backend\code49.c" />
     <ClCompile Include="..\..\backend\common.c" />
     <ClCompile Include="..\..\backend\composite.c" />
-    <ClCompile Include="..\..\backend\dllversion.c">
+    <ClCompile Include="..\..\backend\dllversion.c" />
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\backend\dmatrix.c" />
     <ClCompile Include="..\..\backend\dotcode.c" />
     <ClCompile Include="..\..\backend\eci.c" />
@@ -162,9 +214,7 @@
     <ClInclude Include="..\..\backend\zintconfig.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\backend\libzint.rc">
+    <ResourceCompile Include="..\..\backend\libzint.rc" />
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'">true</ExcludedFromBuild>
-    </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

win32/vs2017/zint.vcxproj

@@ -52,7 +52,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <ExceptionHandling />
@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling />
@@ -84,16 +84,16 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\getopt\getopt.c" />
+    <ClCompile Include="..\..\getopt\getopt.c" />
-    <ClCompile Include="..\getopt\getopt1.c" />
+    <ClCompile Include="..\..\getopt\getopt1.c" />
-    <ClCompile Include="..\frontend\main.c" />
+    <ClCompile Include="..\..\frontend\main.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\frontend\resource.h" />
+    <ClInclude Include="..\..\frontend\resource.h" />
-    <ClInclude Include="..\getopt\getopt.h" />
+    <ClInclude Include="..\..\getopt\getopt.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\frontend\zint.rc" />
+    <ResourceCompile Include="..\..\frontend\zint.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="libzint.vcxproj">

win32/vs2019/libzint.vcxproj

@@ -56,7 +56,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <ExceptionHandling />
@@ -76,9 +76,9 @@
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <Link>
-      <AdditionalDependencies>libpng16_static.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libpng.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zint.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -90,7 +90,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling />
@@ -109,9 +109,9 @@
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <Link>
-      <AdditionalDependencies>libpng16_static.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libpng.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zint.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

win32/zint_cmdline_vc6/readme.txt

@@ -10,8 +10,8 @@ How to compile:
 $ZR is the zint root folder (this file is in $ZR\win32\zint_cmdline_vc6)
 
 * get vc6 shell
-(if not available in the Start Menu, open a Command Prompt and run
+if not available in the Start Menu, open a Command Prompt and run
-"C:\Program Files (x86)\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT")
+"C:\Program Files (x86)\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT"
 
 a) zlib (current version: 1.2.13)
 * put zlib to $ZR\..\zlib