diff --git a/win32/vs2015/libzint.vcxproj b/win32/vs2015/libzint.vcxproj
index a9b9d976..f1c55f6a 100644
--- a/win32/vs2015/libzint.vcxproj
+++ b/win32/vs2015/libzint.vcxproj
@@ -1,413 +1,316 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release_LIB
- Win32
-
-
- Release_LIB
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {5C08DC40-8F7D-475E-AA3C-814DED735A4B}
- libzint_png_qr
- Win32Proj
-
-
-
- StaticLibrary
- v140
- MultiByte
- false
-
-
- StaticLibrary
- v140
- MultiByte
- false
-
-
- DynamicLibrary
- v140
- MultiByte
- false
-
-
- DynamicLibrary
- v140
- MultiByte
- false
-
-
- DynamicLibrary
- MultiByte
- v140
-
-
- DynamicLibrary
- MultiByte
- v140
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>12.0.30501.0
-
-
- $(SolutionDir)$(Configuration)\
- $(Configuration)\
- true
- zintd
-
-
- true
-
-
- $(SolutionDir)$(Configuration)\
- $(Configuration)\
- false
- zint
-
-
- false
-
-
- $(SolutionDir)$(Configuration)\
- $(Configuration)\
-
-
-
- Disabled
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0.9";DEBUG;%(PreprocessorDefinitions)
- true
-
- EnableFastChecks
- true
- MultiThreadedDebugDLL
- false
-
- Level3
- ProgramDatabase
- 4018;4244;4305;%(DisableSpecificWarnings)
-
-
- _DEBUG;%(PreprocessorDefinitions)
-
-
- false
-
-
- %(AdditionalDependencies)
- $(OutDir)zintd.dll
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories)
- libcmtd.lib;%(IgnoreSpecificDefaultLibraries)
- true
- Windows
- MachineX86
-
-
-
-
- Disabled
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)
- _DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0.9";DEBUG;%(PreprocessorDefinitions)
-
-
- EnableFastChecks
- true
- MultiThreadedDebugDLL
- false
-
-
- Level3
- ProgramDatabase
- 4018;4244;4305;%(DisableSpecificWarnings)
-
-
- _DEBUG;%(PreprocessorDefinitions)
-
-
- false
-
-
- zlibd.lib;%(AdditionalDependencies)
- $(OutDir)zintd.dll
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories)
- libcmtd.lib;%(IgnoreSpecificDefaultLibraries)
- true
- Windows
-
-
-
-
- MaxSpeed
- false
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0.9";%(PreprocessorDefinitions)
- true
-
- MultiThreadedDLL
- false
- false
-
- Level3
-
- 4018;4244;4305;%(DisableSpecificWarnings)
-
-
- NDEBUG;%(PreprocessorDefinitions)
-
-
- false
-
-
- zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies)
- $(OutDir)zint.dll
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories)
- false
- Windows
- true
- true
- MachineX86
-
-
-
-
- MaxSpeed
- false
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)
- NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0.9";%(PreprocessorDefinitions)
- true
-
-
- MultiThreadedDLL
- false
- false
-
-
- Level3
-
-
- 4018;4244;4305;%(DisableSpecificWarnings)
-
-
- NDEBUG;%(PreprocessorDefinitions)
-
-
- false
-
-
- zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies)
- $(OutDir)zint.dll
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories)
- false
- Windows
- true
- true
-
-
-
-
- MaxSpeed
- false
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0.9";%(PreprocessorDefinitions)
- true
-
- MultiThreaded
- false
- false
-
- Level3
-
- 4018;4244;4305;%(DisableSpecificWarnings)
-
-
- NDEBUG;%(PreprocessorDefinitions)
-
-
- $(OutDir)libzint.lib
- zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies)
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories)
-
-
-
-
- MaxSpeed
- false
- ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)
- NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0.9";%(PreprocessorDefinitions)
- true
-
-
- MultiThreadedDLL
- false
- false
-
-
- Level3
-
-
- 4018;4244;4305;%(DisableSpecificWarnings)
-
-
- NDEBUG;%(PreprocessorDefinitions)
-
-
- $(OutDir)libzintMD.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
+
+
+
+
+ Release_LIB
+ Win32
+
+
+ Release_LIB
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {5C08DC40-8F7D-475E-AA3C-814DED735A4B}
+ libzint_png_qr
+ Win32Proj
+
+
+
+ StaticLibrary
+ v140
+ MultiByte
+ false
+
+
+ StaticLibrary
+ v140
+ MultiByte
+ false
+
+
+ DynamicLibrary
+ v140
+ MultiByte
+ false
+
+
+ DynamicLibrary
+ v140
+ MultiByte
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>12.0.30501.0
+
+
+ $(SolutionDir)$(Configuration)\
+ $(Configuration)\
+ false
+ zint
+
+
+ false
+
+
+ $(SolutionDir)$(Configuration)\
+ $(Configuration)\
+
+
+
+ MaxSpeed
+ false
+ ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)
+ true
+
+ MultiThreadedDLL
+ false
+ false
+
+ Level3
+
+ 4018;4244;4305;%(DisableSpecificWarnings)
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+
+
+ false
+
+
+ zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies)
+ $(OutDir)zint.dll
+ ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories)
+ false
+ Windows
+ true
+ true
+ MachineX86
+
+
+
+
+ MaxSpeed
+ false
+ ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)
+ NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)
+ true
+
+
+ MultiThreadedDLL
+ false
+ false
+
+
+ Level3
+
+
+ 4018;4244;4305;%(DisableSpecificWarnings)
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+
+
+ false
+
+
+ zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies)
+ $(OutDir)zint.dll
+ ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories)
+ false
+ Windows
+ true
+ true
+
+
+
+
+ MaxSpeed
+ false
+ ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)
+ true
+
+ MultiThreaded
+ false
+ false
+
+ Level3
+
+ 4018;4244;4305;%(DisableSpecificWarnings)
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+
+
+ $(OutDir)libzint.lib
+ zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies)
+ ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories)
+
+
+
+
+ MaxSpeed
+ false
+ ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalIncludeDirectories)
+ NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)
+ true
+
+
+ MultiThreadedDLL
+ false
+ false
+
+
+ Level3
+
+
+ 4018;4244;4305;%(DisableSpecificWarnings)
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+
+
+ $(OutDir)libzintMD.lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
diff --git a/win32/vs2015/zint.sln b/win32/vs2015/zint.sln
index f82500be..17b95a0f 100644
--- a/win32/vs2015/zint.sln
+++ b/win32/vs2015/zint.sln
@@ -14,18 +14,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
Release_LIB|Win32 = Release_LIB|Win32
Release_LIB|x64 = Release_LIB|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|Win32.ActiveCfg = Debug|Win32
- {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|Win32.Build.0 = Debug|Win32
- {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|x64.ActiveCfg = Debug|x64
- {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|x64.Build.0 = Debug|x64
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|Win32.ActiveCfg = Release_LIB|Win32
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|Win32.Build.0 = Release_LIB|Win32
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|x64.ActiveCfg = Release_LIB|x64
@@ -34,10 +28,6 @@ Global
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|Win32.Build.0 = Release|Win32
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|x64.ActiveCfg = Release|x64
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|x64.Build.0 = Release|x64
- {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|Win32.ActiveCfg = Debug|Win32
- {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|Win32.Build.0 = Debug|Win32
- {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|x64.ActiveCfg = Debug|x64
- {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|x64.Build.0 = Debug|x64
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|Win32.ActiveCfg = Release_LIB|Win32
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|Win32.Build.0 = Release_LIB|Win32
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|x64.ActiveCfg = Release_LIB|x64
diff --git a/win32/vs2015/zint.vcxproj b/win32/vs2015/zint.vcxproj
index 639e7403..ce42ae61 100644
--- a/win32/vs2015/zint.vcxproj
+++ b/win32/vs2015/zint.vcxproj
@@ -1,245 +1,165 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release_LIB
- Win32
-
-
- Release_LIB
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}
- zint
- Win32Proj
-
-
-
- Application
- v140
- MultiByte
- false
-
-
- Application
- v140
- MultiByte
- false
-
-
- Application
- v140
- MultiByte
- false
-
-
- Application
- v140
- MultiByte
- false
-
-
- Application
- v140
- MultiByte
-
-
- Application
- v140
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>12.0.30501.0
-
-
- $(SolutionDir)$(Configuration)\
- $(Configuration)\
-
-
-
- $(SolutionDir)$(Configuration)\
- $(Configuration)\
-
-
- $(SolutionDir)$(Configuration)\
- $(Configuration)\
-
-
-
- Disabled
- ..\..\backend;%(AdditionalIncludeDirectories)
- WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0.9";ZINT_DLL;%(PreprocessorDefinitions)
- true
-
- EnableFastChecks
- true
- MultiThreadedDebugDLL
- true
-
- Level3
- EditAndContinue
-
-
- true
-
-
-
-
- Disabled
- ..\..\backend;%(AdditionalIncludeDirectories)
- WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0.9";ZINT_DLL;%(PreprocessorDefinitions)
-
-
- EnableFastChecks
- true
- MultiThreadedDebugDLL
- true
-
-
- Level3
- ProgramDatabase
-
-
- true
-
-
-
-
- MaxSpeed
- ..\..\backend;%(AdditionalIncludeDirectories)
- WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0.9";ZINT_DLL;%(PreprocessorDefinitions)
- true
-
- MultiThreaded
- false
- false
-
- Level3
-
-
-
- ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)
-
-
-
-
- MaxSpeed
- ..\..\backend;%(AdditionalIncludeDirectories)
- WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0.9";ZINT_DLL;%(PreprocessorDefinitions)
- true
-
-
- MultiThreaded
- false
- false
-
-
- Level3
-
-
-
-
- ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories)
-
-
-
-
- MaxSpeed
- ..\..\backend;%(AdditionalIncludeDirectories)
- WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0.9";%(PreprocessorDefinitions)
- true
-
- MultiThreadedDLL
- false
- false
-
- Level3
-
-
-
- libpng.lib;zlib.lib;%(AdditionalDependencies)
-
-
-
-
- MaxSpeed
- ..\..\backend;%(AdditionalIncludeDirectories)
- WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0.9";%(PreprocessorDefinitions)
- true
-
-
- MultiThreadedDLL
- false
- false
-
-
- Level3
-
-
-
-
- libpng.lib;zlib.lib;%(AdditionalDependencies)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {5c08dc40-8f7d-475e-aa3c-814ded735a4b}
- false
-
-
-
-
-
-
+
+
+
+
+ Release_LIB
+ Win32
+
+
+ Release_LIB
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}
+ zint
+ Win32Proj
+
+
+
+ Application
+ v140
+ MultiByte
+ false
+
+
+ Application
+ v140
+ MultiByte
+ false
+
+
+ Application
+ v140
+ MultiByte
+ false
+
+
+ Application
+ v140
+ MultiByte
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>12.0.30501.0
+
+
+ $(SolutionDir)$(Configuration)\
+ $(Configuration)\
+
+
+ $(SolutionDir)$(Configuration)\
+ $(Configuration)\
+
+
+
+ MaxSpeed
+ ..\..\backend;%(AdditionalIncludeDirectories)
+ WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)
+ true
+
+ MultiThreaded
+ false
+ false
+
+ Level3
+
+
+
+
+
+ MaxSpeed
+ ..\..\backend;%(AdditionalIncludeDirectories)
+ WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";ZINT_DLL;%(PreprocessorDefinitions)
+ true
+
+
+ MultiThreaded
+ false
+ false
+
+
+ Level3
+
+
+
+
+
+
+ MaxSpeed
+ ..\..\backend;%(AdditionalIncludeDirectories)
+ WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)
+ true
+
+ MultiThreadedDLL
+ false
+ false
+
+ Level3
+
+
+
+
+
+ MaxSpeed
+ ..\..\backend;%(AdditionalIncludeDirectories)
+ WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.16.0";%(PreprocessorDefinitions)
+ true
+
+
+ MultiThreadedDLL
+ false
+ false
+
+
+ Level3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {5c08dc40-8f7d-475e-aa3c-814ded735a4b}
+ false
+
+
+
+
+
+