diff --git a/docs/manual.html b/docs/manual.html index 9407ae32..4bf57285 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -7907,13 +7907,11 @@ this can be initiated through the API by setting

class="sourceCode c">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 may be specified using --vers=2 (API -option_2 = 2).

+

Revision 2 of Ultracode (2023) may be specified using +--vers=2 (API option_2 = 2).

-

WARNING: Revision 2 of Ultracode is currently (December 2023) -undergoing major modifications, yet to be finalized, and should not be -used in a production environment.

+

WARNING: Revision 2 of Ultracode was only finalized December 2023 and +Zint has not yet been updated to support it. Do not use.

Ultracode supports Structured Append of up to 8 symbols and an optional numeric ID (File Number), which can be set by using the diff --git a/docs/manual.pmd b/docs/manual.pmd index dd85a1d2..6aed2ba7 100644 --- a/docs/manual.pmd +++ b/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 -may be specified using `--vers=2` (API `option_2 = 2`). +Revision 2 of Ultracode (2023) may be specified using `--vers=2` (API +`option_2 = 2`). * * * -WARNING: Revision 2 of Ultracode is currently (December 2023) undergoing major -modifications, yet to be finalized, and should not be used in a production -environment. +WARNING: Revision 2 of Ultracode was only finalized December 2023 and Zint has +not yet been updated to support it. Do not use. * * * diff --git a/docs/manual.txt b/docs/manual.txt index 806504c2..1996b095 100644 --- a/docs/manual.txt +++ b/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 -may be specified using --vers=2 (API option_2 = 2). +Revision 2 of Ultracode (2023) may be specified using --vers=2 (API +option_2 = 2). -------------------------------------------------------------------------------- -WARNING: Revision 2 of Ultracode is currently (December 2023) undergoing major -modifications, yet to be finalized, and should not be used in a production -environment. +WARNING: Revision 2 of Ultracode was only finalized December 2023 and Zint has +not yet been updated to support it. Do not use. -------------------------------------------------------------------------------- diff --git a/frontend_qt/frontend_qt.pro b/frontend_qt/frontend_qt.pro index dd59e644..3ae70a91 100644 --- a/frontend_qt/frontend_qt.pro +++ b/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:QMAKE_LIBDIR+="../../lpng/projects/vstudio/Release Library" + win32:LIBS += -llibpng -lzlib + win32:QMAKE_LIBDIR+=../../lpng/ ../../zlib # Unix #unix:LIBS += -lpng -zlib #unix:QMAKE_LIBDIR += /usr/local/lib /usr/lib/x86_64-linux-gnu/ diff --git a/frontend_qt/howto_build_qzint_using_msvs2015.txt b/frontend_qt/howto_build_qzint_using_msvs2015.txt index cd071986..59ed27c5 100644 --- a/frontend_qt/howto_build_qzint_using_msvs2015.txt +++ b/frontend_qt/howto_build_qzint_using_msvs2015.txt @@ -14,59 +14,63 @@ Build static Qt: - Install Python (https://www.python.org/downloads/windows/) and make it available within the path. - 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") + Visual Studio 2015\Visual Studio Tools\Windows Desktop Command Prompts\VS2015 x86 Native Tools-Eingabeaufforderung +- ("Eingabeaufforderung" = "Command Prompt") -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%" +- 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.20348.0\x86;%PATH%" -- 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 - One may set another destination folder after the -prefix option. - Attention, the upper command is one long line. -- nmake -- nmake install - The last 3 commands run around 3 hours. - Make sure, that python may be found in the path. + 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 +- One may set another destination folder after the -prefix option. +- Attention, the upper command is one long line. + nmake + nmake install +- The last 3 commands run around 3 hours. +- 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 - -> this file is in $ZH\frontend_qt -- png1620.zip unzipped in $ZH\..\lpng - -> $ZH\..\lpng\png.h exists -- zlib128.zip unzipped in folder $ZH\..\zlib - -> $ZH\..\zlib\zlib.h exists +- zint source files in %ZH%, e.g. + set "ZH=%cd%\zint" + git clone https://git.code.sf.net/p/zint/code "%ZH%" +-> this file is in %ZH%\frontend_qt + +- 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 -Set Project settings->C++->Code Generation->Library: Multi-Threadded DLL /MD -Copy the zlib source as required by the make file (in my case: zlib-1.2.8) -Build targets "Release Library" for zlib and libpng. + cd "%ZH%\..\zlib" + nmake -f win32\Makefile.msc clean + nmake -f win32\Makefile.msc + 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 PATH=C:\Qt\5.15.2static\bin;%PATH% -- set QMAKESPEC=win32-msvc -- cd $ZH + set QTDIR=C:\Qt\5.15.2static + set PATH=C:\Qt\5.15.2static\bin;%PATH% + set QMAKESPEC=win32-msvc + cd "%ZH%" -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%" + cd backend_qt + qmake backend_qt.pro + nmake clean + nmake release -- cd backend_qt -- qmake backend_qt.pro -- nmake clean -- nmake release - -- cd ..\frontend_qt -- qmake frontend_qt.pro -- nmake clean -- nmake release - -> qtZint.exe is in the release folder + cd ..\frontend_qt + qmake frontend_qt.pro + nmake clean + nmake release +-> qtZint.exe is in the release folder Note: For me, qt5core.lib was not found in the last step. diff --git a/tools/update_version.php b/tools/update_version.php index 25adc947..9c3c9c3c 100644 --- a/tools/update_version.php +++ b/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 + Copyright (C) 2020-2023 Robin Stuart */ /* 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 . '"'); diff --git a/win32/README b/win32/README index d5dc4a26..4a1c8c5c 100644 --- a/win32/README +++ b/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 -"Visual Studio 2017" tab in the Start menu). +Open a "Developer Command Prompt for VS 2022" (should be available under the +"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 - - cmake -G "Visual Studio 15 2017" -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 - + nmake -f scripts\makefile.vcwin32 clean + nmake -f scripts\makefile.vcwin32 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 -same as for Visual Studio 2017. To build lpng use - - 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. +Solutions for Visual Studio 2019 and 2017 are in sub-directories vs2019 and +vs2017. The steps are the same as for Visual Studio 2022. Visual Studio 2015 ------------------ -The solution and project files for Visual Studio 2015 have been moved to the -sub-directory vs2015. The steps are almost the same as for Visual Studio 2017, -except that "rc.exe" may not be available. If so, you need to install a Windows -Kit and then update your PATH, e.g. (adjust for version): +A solution for Visual Studio 2015 is in sub-directory vs2015. The steps are +almost the same as for Visual Studio 2022, except that "rc.exe" may not be +available. If so, you need to install a Windows Kit and then update your PATH, +e.g. (adjust for version): - set "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.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 + set "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.20348.0\x86;%PATH%" 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 -they're compatible. +2015 32-bit, but you can use "MSVC 2019 32-bit" instead as it's 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 and clone lpng, zlib and zint into it. Then - - 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 .. +As above, follow the steps to build zlib and lpng. 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". - -You may need to rename "libpng16_static.lib" to "libpng.lib" depending on the -version of cmake you have. + "zlib\zlib.lib" and "lpng\libpng.lib" into "lib". This example uses Qt 5.15.2 and component "MSVC 2019 32-bit" so install them and add to path (your path may differ): diff --git a/win32/libzint.vcxproj b/win32/libzint.vcxproj deleted file mode 100644 index 6229bde9..00000000 --- a/win32/libzint.vcxproj +++ /dev/null @@ -1,222 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {5C08DC40-8F7D-475E-AA3C-814DED735A4B} - libzint_png_qr - Win32Proj - - - - - DynamicLibrary - v141 - MultiByte - false - - - DynamicLibrary - MultiByte - v141 - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - zint - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - zint - - - - Disabled - ..\..\zlib\;..\..\lpng\;..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) - true - - EnableFastChecks - true - MultiThreadedDebugDLL - false - - Level3 - ProgramDatabase - 4018;4244;4305;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - - - false - - - libpng16_static.lib;zlib.lib;%(AdditionalDependencies) - $(OutDir)zint.dll - ..\..\lpng\build\Release;..\..\zlib;%(AdditionalLibraryDirectories) - libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX86 - false - - - - - MaxSpeed - false - ..\..\zlib\;..\..\lpng\;..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) - true - - MultiThreadedDLL - false - false - - Level3 - - 4018;4244;4305;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - - - false - - - libpng16_static.lib;zlib.lib;%(AdditionalDependencies) - $(OutDir)zint.dll - ..\..\lpng\build\Release;..\..\zlib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs2008/libzint.vcproj b/win32/vs2008/libzint.vcproj index ee0e5295..57728e35 100644 --- a/win32/vs2008/libzint.vcproj +++ b/win32/vs2008/libzint.vcproj @@ -68,10 +68,10 @@ Disabled - ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) + ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) 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) true @@ -138,7 +138,7 @@ %(AdditionalDependencies) $(OutDir)zintd.dll - ..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true Windows @@ -148,7 +148,7 @@ Disabled - ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) + ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) 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) @@ -171,7 +171,7 @@ zlibd.lib;%(AdditionalDependencies) $(OutDir)zintd.dll - ..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true Windows @@ -181,7 +181,7 @@ MaxSpeed false - ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) + ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) 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) true @@ -200,9 +200,9 @@ false - libpng16_static.lib;zlib.lib;%(AdditionalDependencies) + libpng.lib;zlib.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) false Windows true @@ -214,7 +214,7 @@ MaxSpeed false - ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) + ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) 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) true @@ -236,9 +236,9 @@ false - libpng16_static.lib;zlib.lib;%(AdditionalDependencies) + libpng.lib;zlib.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) false Windows true @@ -249,7 +249,7 @@ MaxSpeed false - ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) + ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";%(PreprocessorDefinitions) true @@ -272,7 +272,7 @@ MaxSpeed false - ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) + ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";%(PreprocessorDefinitions) true diff --git a/win32/vs2015/zint.vcxproj b/win32/vs2015/zint.vcxproj index e08397f9..e669f7b5 100644 --- a/win32/vs2015/zint.vcxproj +++ b/win32/vs2015/zint.vcxproj @@ -158,7 +158,7 @@ - ..\..\..\lpng\build\Release;%(AdditionalLibraryDirectories) + ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) @@ -179,7 +179,7 @@ - ..\..\..\lpng\build\Release;%(AdditionalLibraryDirectories) + ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) @@ -197,8 +197,7 @@ - libpngMD.lib;zlibMD.lib;%(AdditionalDependencies) - d:\opt\lib;%(AdditionalLibraryDirectories) + libpng.lib;zlib.lib;%(AdditionalDependencies) @@ -219,8 +218,7 @@ - libpngMD.lib;zlibMD.lib;%(AdditionalDependencies) - d:\opt\lib;%(AdditionalLibraryDirectories) + libpng.lib;zlib.lib;%(AdditionalDependencies) diff --git a/win32/SetWindowsTargetPlatformVersion.props b/win32/vs2017/SetWindowsTargetPlatformVersion.props similarity index 100% rename from win32/SetWindowsTargetPlatformVersion.props rename to win32/vs2017/SetWindowsTargetPlatformVersion.props diff --git a/win32/vs2015/vsx/libzintMD.vcxproj b/win32/vs2017/libzint.vcxproj similarity index 55% rename from win32/vs2015/vsx/libzintMD.vcxproj rename to win32/vs2017/libzint.vcxproj index 1d25e872..25f764d5 100644 --- a/win32/vs2015/vsx/libzintMD.vcxproj +++ b/win32/vs2017/libzint.vcxproj @@ -1,8 +1,12 @@  - + - - Release_LIB + + Debug + Win32 + + + Release Win32 @@ -11,60 +15,110 @@ libzint_png_qr Win32Proj + - - StaticLibrary - NotSet + + DynamicLibrary + v141 + MultiByte false - v140 + + + DynamicLibrary + MultiByte + v141 - + + + + - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - AllRules.ruleset - - - libzintMD + <_ProjectFileVersion>12.0.30501.0 - + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + zint + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + zint + + + + Disabled + ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + true + + EnableFastChecks + true + MultiThreadedDebugDLL + false + + Level3 + ProgramDatabase + 4018;4244;4305;%(DisableSpecificWarnings) + + + _DEBUG;%(PreprocessorDefinitions) + + + false + + + libpng.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir)zint.dll + ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) + libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + MachineX86 + false + + + MaxSpeed - true - d:\opt1\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";ZINT_NO_PNG;%(PreprocessorDefinitions) + false + ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) true - - + MultiThreadedDLL - true + false false - - + Level3 - - + 4018;4244;4305;%(DisableSpecificWarnings) - false - - - - NDEBUG;%(PreprocessorDefinitions) - - $(OutDir)$(TargetName)$(TargetExt) + + false + + + libpng.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir)zint.dll + ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) + false + Windows + true + true MachineX86 - + false + @@ -80,9 +134,7 @@ - - true - + @@ -162,9 +214,7 @@ - - true - + diff --git a/win32/zint.sln b/win32/vs2017/zint.sln similarity index 100% rename from win32/zint.sln rename to win32/vs2017/zint.sln diff --git a/win32/zint.vcxproj b/win32/vs2017/zint.vcxproj similarity index 87% rename from win32/zint.vcxproj rename to win32/vs2017/zint.vcxproj index 9af8747c..889cd42b 100644 --- a/win32/zint.vcxproj +++ b/win32/vs2017/zint.vcxproj @@ -52,7 +52,7 @@ Disabled - ..\backend;%(AdditionalIncludeDirectories) + ..\..\backend;%(AdditionalIncludeDirectories) WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";ZINT_DLL;%(PreprocessorDefinitions) true @@ -71,7 +71,7 @@ MaxSpeed - ..\backend;%(AdditionalIncludeDirectories) + ..\..\backend;%(AdditionalIncludeDirectories) WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";ZINT_DLL;%(PreprocessorDefinitions) true @@ -84,16 +84,16 @@ - - - + + + - - + + - + diff --git a/win32/vs2019/libzint.vcxproj b/win32/vs2019/libzint.vcxproj index b39bdc04..17eb77af 100644 --- a/win32/vs2019/libzint.vcxproj +++ b/win32/vs2019/libzint.vcxproj @@ -56,7 +56,7 @@ Disabled - ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) + ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) true @@ -76,9 +76,9 @@ false - libpng16_static.lib;zlib.lib;%(AdditionalDependencies) + libpng.lib;zlib.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true Windows @@ -90,7 +90,7 @@ MaxSpeed false - ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) + ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.12.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) true @@ -109,9 +109,9 @@ false - libpng16_static.lib;zlib.lib;%(AdditionalDependencies) + libpng.lib;zlib.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\lpng\build\Release;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) false Windows true diff --git a/win32/zint_cmdline_vc6/readme.txt b/win32/zint_cmdline_vc6/readme.txt index f9d77890..7c7bd3e7 100644 --- a/win32/zint_cmdline_vc6/readme.txt +++ b/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 -"C:\Program Files (x86)\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT") +if not available in the Start Menu, open a Command Prompt and run +"C:\Program Files (x86)\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" a) zlib (current version: 1.2.13) * put zlib to $ZR\..\zlib