diff --git a/README.linux b/README.linux index 4108fffe..79e2312d 100644 --- a/README.linux +++ b/README.linux @@ -1,4 +1,4 @@ -% README.linux 2025-09-12 +% README.linux 2025-09-16 % Tested on Ubuntu 20.04.4 LTS, Ubuntu 22.04 LTS, Ubuntu 24.04 LTS and % Fedora Linux 42 (Workstation Edition) @@ -29,6 +29,7 @@ and navigate to "src/c-lib" and make with EXCLUDE_SYNTAX_DICTIONARY_LOADER defin cd gs1-syntax-engine/src/c-lib make CFLAGS_G='-DEXCLUDE_SYNTAX_DICTIONARY_LOADER' lib && sudo make install + cd ../../.. Now either download the zint source code tarball @@ -118,6 +119,7 @@ The rest is standard CMake make sudo make install + 4. Run ====== diff --git a/README.macos b/README.macos index ed9569f8..cbd031b7 100644 --- a/README.macos +++ b/README.macos @@ -1,4 +1,4 @@ -% README.macos 2025-09-12 +% README.macos 2025-09-16 % Tested on macOS 12.7.2 Monterey VirtualBox (thanks to https://github.com/myspaghetti/macos-virtualbox) 1. Prerequisites for building zint and zint-qt @@ -34,6 +34,7 @@ Clone and install the gs1encoders library (optional but necessary for GS1 Syntax git clone https://github.com/gs1/gs1-syntax-engine cd gs1-syntax-engine/src/c-lib make CFLAGS_G='-DEXCLUDE_SYNTAX_DICTIONARY_LOADER' lib && sudo make install + cd ../../.. Add the Qt5 bin directory to the PATH diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index ae06c769..ae38f3fe 100644 --- a/backend_qt/backend_qt.pro +++ b/backend_qt/backend_qt.pro @@ -19,10 +19,11 @@ INCLUDEPATH += ../backend #EDIT THIS !!!! DEFINES += ZINT_VERSION="\\\"2.15.0.9\\\"" -!contains(DEFINES, ZINT_NO_PNG) { - INCLUDEPATH += ../../lpng - INCLUDEPATH += ../../zlib -} +INCLUDEPATH += ../../lpng +INCLUDEPATH += ../../zlib + +DEFINES += ZINT_HAVE_GS1SE +INCLUDEPATH += ../../gs1-syntax-engine/src/c-lib HEADERS += ../backend/aztec.h \ ../backend/big5.h \ diff --git a/backend_qt/backend_qt_zintdll.pro b/backend_qt/backend_qt_zintdll.pro index 82ff054a..25a3b115 100644 --- a/backend_qt/backend_qt_zintdll.pro +++ b/backend_qt/backend_qt_zintdll.pro @@ -6,8 +6,6 @@ TARGET = QtZintDLL INCLUDEPATH += ../backend -LIBS += -L"../win32/Release" -lzint - HEADERS += qzint.h SOURCES += qzint.cpp diff --git a/docs/README b/docs/README index 669092fc..bfa9f267 100644 --- a/docs/README +++ b/docs/README @@ -1,11 +1,11 @@ -% docs/README 2025-06-05 +% docs/README 2025-09-16 For generation of "docs/manual.pdf" and "docs/manual.txt" from "manual.pmd" using a recent version of pandoc On Ubuntu/Debian (tested on Ubuntu 22.04 and Ubuntu 24.04) - wget https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-1-amd64.deb - sudo dpkg -i pandoc-3.7.0.2-1-amd64.deb + wget https://github.com/jgm/pandoc/releases/download/3.8/pandoc-3.8-1-amd64.deb + sudo dpkg -i pandoc-3.8-1-amd64.deb For Ubuntu 22.04 (python < 3.12) sudo apt install python3-pip pip install pandoc-tablenos --user @@ -27,9 +27,9 @@ Then On Fedora (tested on Fedora Linux 38 (Workstation Edition) and Fedora Linux 40 (Workstation Edition)) - wget https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-linux-amd64.tar.gz - tar xf pandoc-3.7.0.2-linux-amd64.tar.gz - sudo mv -i pandoc-3.7.0.2/bin/pandoc /usr/local/bin + wget https://github.com/jgm/pandoc/releases/download/3.8/pandoc-3.8-linux-amd64.tar.gz + tar xf pandoc-3.8-linux-amd64.tar.gz + sudo mv -i pandoc-3.8/bin/pandoc /usr/local/bin sudo dnf install python3-pip pip install pandoc-tablenos --user export PATH=~/.local/bin:"$PATH" diff --git a/docs/zint.1 b/docs/zint.1 index 69ba80e9..6b5c4c70 100644 --- a/docs/zint.1 +++ b/docs/zint.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pandoc 3.7.0.2 +.\" Automatically generated by Pandoc 3.8 .\" .TH "ZINT" "1" "September 2025" "Version 2.15.0.9" .SH NAME diff --git a/frontend_qt/frontend_qt.pro b/frontend_qt/frontend_qt.pro index 30ccbde5..c3de0091 100644 --- a/frontend_qt/frontend_qt.pro +++ b/frontend_qt/frontend_qt.pro @@ -4,10 +4,10 @@ DEPENDPATH += . debug release INCLUDEPATH += . INCLUDEPATH += ../backend INCLUDEPATH += ../backend_qt -!contains(DEFINES, ZINT_NO_PNG) { - INCLUDEPATH += ../../lpng - INCLUDEPATH += ../../zlib -} +INCLUDEPATH += ../../lpng +INCLUDEPATH += ../../zlib +INCLUDEPATH += ../../gs1-syntax-engine/src/c-lib + QT += uitools QT += widgets QT += svg @@ -89,11 +89,9 @@ QMAKE_LIBDIR += ../backend_qt/release LIBS += -lQt5Core QMAKE_LIBDIR += C:/qt/5.15.16static/lib -!contains(DEFINES, ZINT_NO_PNG) { # Win - win32:LIBS += -llibpng -lzlib - win32:QMAKE_LIBDIR+=../../lpng/ ../../zlib + win32:LIBS += -llibpng -lzlib -lgs1encoders + win32:QMAKE_LIBDIR+=../../lpng/ ../../zlib ../../gs1-syntax-engine/src/c-lib # Unix - #unix:LIBS += -lpng -zlib + #unix:LIBS += -lpng -zlib -lgs1encoders #unix:QMAKE_LIBDIR += /usr/local/lib /usr/lib/x86_64-linux-gnu/ -} diff --git a/frontend_qt/frontend_qt_zintdll.pro b/frontend_qt/frontend_qt_zintdll.pro index 86982a50..9dd4e1b3 100644 --- a/frontend_qt/frontend_qt_zintdll.pro +++ b/frontend_qt/frontend_qt_zintdll.pro @@ -71,6 +71,6 @@ RC_FILE += res/qtZint.rc INCLUDEPATH += ../backend_qt ../backend -LIBS += -lQtZintDLL -lzint +LIBS += -lQtZintDLL -L"../win32/Release" -L"../win32/vs2019/Release" -L"../win32/vs2017/Release" -L"../win32/vs2015/Release" -lzint QMAKE_LIBDIR += ../backend_qt/release QMAKE_LIBDIR += ../win32/Release diff --git a/frontend_qt/howto_build_qzint_using_msvs2015.txt b/frontend_qt/howto_build_qzint_using_msvs2015.txt index 488c8353..92a23b68 100644 --- a/frontend_qt/howto_build_qzint_using_msvs2015.txt +++ b/frontend_qt/howto_build_qzint_using_msvs2015.txt @@ -1,5 +1,5 @@ Harald Oehlmann -2025-02-04 +2025-09-16 How to build qzint.exe using: - QT 5.15.16 source package @@ -17,6 +17,11 @@ Build static Qt: Visual Studio 2015\Visual Studio Tools\Windows Desktop Command Prompts\VS2015 x86 Native Tools-Eingabeaufforderung - ("Eingabeaufforderung" = "Command Prompt") +- WARNING: MS Visual Studio 2015 will only work with up to Windows Kit 10.0.20348.0, which was removed in a recent update + (see https://developercommunity.visualstudio.com/t/Visual-Studio-update-171411-removed-th/10953401?sort=newest) + It can be reinstalled at https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/index-legacy + You may need to manually reset the environment variables INCLUDE, LIB, UCRTVersion, WindowsSDKLibVersion and WindowsSDKVersion. + - 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%" @@ -45,6 +50,9 @@ Zint Folder structure: git clone https://github.com/madler/zlib.git "%ZH%\..\zlib" -> %ZH%\..\zlib\zlib.h exists +- gs1-syntax-engine source files in %ZH%\..\gs1-syntax-engine + git clone https://github.com/gitlost/gs1-syntax-engine "%ZH%\..\gs1-syntax-engine" + Build libpng: ------------- cd "%ZH%\..\zlib" @@ -54,6 +62,12 @@ Build libpng: nmake -f scripts\makefile.vcwin32 clean nmake -f scripts\makefile.vcwin32 +Build gs1-syntax-engine: +------------------------ + cd "%ZH%\..\gs1-syntax-engine\src\c-lib" + nmake -f makefile.vcwin32 clean + nmake -f makefile.vcwin32 + Build zint: ----------- set QTDIR=C:\Qt\5.15.16static diff --git a/frontend_qt/mainWindow.ui b/frontend_qt/mainWindow.ui index da1e147b..ba99aa9e 100644 --- a/frontend_qt/mainWindow.ui +++ b/frontend_qt/mainWindow.ui @@ -1623,6 +1623,25 @@ checks necessary for encodation are still performed) + + + + Use GS1 Syntax Engine to +strictly verify GS1 data, +including GS1 Digital Link URIs +(ignored if disabled) + + + GS1 St&rict + + + false + + + true + + + diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp index 286d0d94..3befb67e 100644 --- a/frontend_qt/mainwindow.cpp +++ b/frontend_qt/mainwindow.cpp @@ -229,7 +229,7 @@ void MainWindow::mac_hack_statusBars(QWidget *win, const char* name) MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags fl) : QWidget(parent, fl), m_previewBgColor(0xF4, 0xF4, 0xF4), m_optionWidget(nullptr), m_symbology(0), - m_menu(nullptr), m_chkGS1SyntaxEngine(nullptr), + m_menu(nullptr), m_lblHeightPerRow(nullptr), m_spnHeightPerRow(nullptr), m_btnHeightPerRowDisable(nullptr), m_btnHeightPerRowDefault(nullptr), m_scaleWindow(nullptr) @@ -355,12 +355,10 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags fl) connect(chkGS1Parens, SIGNAL(toggled(bool)), SLOT(update_preview())); connect(chkGS1NoCheck, SIGNAL(toggled(bool)), SLOT(update_preview())); if (m_bc.bc.haveGS1SyntaxEngine()) { - m_chkGS1SyntaxEngine = new QCheckBox(tr("GS1 St&rict")); - m_chkGS1SyntaxEngine->setToolTip(tr("Use GS1 Syntax Engine to\n" - "strictly verify GS1 data\n" - "(ignored if disabled)")); - hLayoutChks->insertWidget(-1, m_chkGS1SyntaxEngine); - connect(m_chkGS1SyntaxEngine, SIGNAL(toggled(bool)), SLOT(update_preview())); + chkGS1Strict->show(); + connect(chkGS1Strict, SIGNAL(toggled(bool)), SLOT(update_preview())); + } else { + chkGS1Strict->hide(); } connect(spnWhitespace, SIGNAL(valueChanged(int)), SLOT(update_preview())); connect(spnVWhitespace, SIGNAL(valueChanged(int)), SLOT(update_preview())); @@ -470,8 +468,8 @@ MainWindow::~MainWindow() settings.setValue(QSL("studio/chk_rinit"), chkRInit->isChecked() ? 1 : 0); settings.setValue(QSL("studio/chk_gs1parens"), chkGS1Parens->isChecked() ? 1 : 0); settings.setValue(QSL("studio/chk_gs1nocheck"), chkGS1NoCheck->isChecked() ? 1 : 0); - if (m_chkGS1SyntaxEngine) { - settings.setValue(QSL("studio/chk_gs1syntax"), m_chkGS1SyntaxEngine->isChecked() ? 1 : 0); + if (chkGS1Strict->isVisible()) { + settings.setValue(QSL("studio/chk_gs1strict"), chkGS1Strict->isChecked() ? 1 : 0); } settings.setValue(QSL("studio/appearance/autoheight"), chkAutoHeight->isChecked() ? 1 : 0); settings.setValue(QSL("studio/appearance/compliantheight"), chkCompliantHeight->isChecked() ? 1 : 0); @@ -544,8 +542,8 @@ void MainWindow::load_settings(QSettings &settings) chkRInit->setChecked(settings.value(QSL("studio/chk_rinit")).toInt() ? true : false); chkGS1Parens->setChecked(settings.value(QSL("studio/chk_gs1parens")).toInt() ? true : false); chkGS1NoCheck->setChecked(settings.value(QSL("studio/chk_gs1nocheck")).toInt() ? true : false); - if (m_chkGS1SyntaxEngine) { - m_chkGS1SyntaxEngine->setChecked(settings.value(QSL("studio/chk_gs1syntax")).toInt() ? true : false); + if (chkGS1Strict->isVisible()) { + chkGS1Strict->setChecked(settings.value(QSL("studio/chk_gs1strict")).toInt() ? true : false); } chkAutoHeight->setChecked(settings.value(QSL("studio/appearance/autoheight"), 1).toInt() ? true : false); chkCompliantHeight->setChecked( @@ -3362,8 +3360,8 @@ void MainWindow::update_preview() btnClearData->setEnabled(!txtData->text().isEmpty()); chkGS1Parens->setEnabled(m_bc.bc.takesGS1AIData(m_symbology) || (m_bc.bc.inputMode() & 0x07) == GS1_MODE); chkGS1NoCheck->setEnabled(chkGS1Parens->isEnabled()); - if (m_chkGS1SyntaxEngine) { - m_chkGS1SyntaxEngine->setEnabled(chkGS1Parens->isEnabled() && !chkGS1NoCheck->isChecked()); + if (chkGS1Strict->isVisible()) { + chkGS1Strict->setEnabled(chkGS1Parens->isEnabled() && !chkGS1NoCheck->isChecked()); } chkRInit->setEnabled(m_bc.bc.supportsReaderInit() && (m_bc.bc.inputMode() & 0x07) != GS1_MODE); chkCompliantHeight->setEnabled(m_bc.bc.hasCompliantHeight()); @@ -3386,8 +3384,8 @@ void MainWindow::update_preview() m_bc.bc.setECI(cmbECI->isEnabled() ? cmbECI->currentIndex() : 0); m_bc.bc.setGS1Parens(chkGS1Parens->isEnabled() && chkGS1Parens->isChecked()); m_bc.bc.setGS1NoCheck(chkGS1NoCheck->isEnabled() && chkGS1NoCheck->isChecked()); - if (m_chkGS1SyntaxEngine) { - m_bc.bc.setGS1SyntaxEngine(m_chkGS1SyntaxEngine->isEnabled() && m_chkGS1SyntaxEngine->isChecked()); + if (chkGS1Strict->isVisible()) { + m_bc.bc.setGS1SyntaxEngine(chkGS1Strict->isEnabled() && chkGS1Strict->isChecked()); } m_bc.bc.setReaderInit(chkRInit->isEnabled() && chkRInit->isChecked()); m_bc.bc.setShowText(chkHRTShow->isEnabled() && chkHRTShow->isChecked()); diff --git a/frontend_qt/mainwindow.h b/frontend_qt/mainwindow.h index 3923ccf9..a2365cf1 100644 --- a/frontend_qt/mainwindow.h +++ b/frontend_qt/mainwindow.h @@ -216,7 +216,6 @@ private: QGraphicsScene *scene; int m_symbology; QMenu *m_menu; - QCheckBox *m_chkGS1SyntaxEngine; QShortcut *m_saveAsShortcut; QShortcut *m_factoryResetShortcut; QShortcut *m_openCLIShortcut; diff --git a/win32/README b/win32/README index 7b3fdcc7..932f6122 100644 --- a/win32/README +++ b/win32/README @@ -1,4 +1,4 @@ -% win32/README 2025-09-12 +% win32/README 2025-09-16 Visual Studio 2022 ------------------ @@ -27,7 +27,7 @@ and cloning each: git clone https://git.code.sf.net/p/zint/code zint git clone https://git.code.sf.net/p/libpng/code lpng git clone https://github.com/madler/zlib.git zlib - git clone https://github.com/gs1/gs1-syntax-engine + git clone https://github.com/gitlost/gs1-syntax-engine First build zlib: @@ -45,13 +45,9 @@ and then lpng: and then gs1encoders: - cd gs1-syntax-engine\src - msbuild /p:Configuration=Release;Platform=x86 gs1encoders.sln /t:gs1encoders - cd ..\.. - -and add the location of gs1encoders.dll to your path: - - set "PATH=%cd%\gs1-syntax-engine\src\c-lib\build\library\Win32\Release;%PATH%" + cd gs1-syntax-engine\src\c-lib + nmake -f makefile.vcwin32 + cd ..\..\.. If you now open "%cd%\zint\win32\zint.sln" with Visual Studio 2022, you should be able to build the Release configuration for Win32. @@ -102,7 +98,11 @@ Visual Studio 2019 and 2017 --------------------------- Solutions for Visual Studio 2019 and 2017 are in sub-directories vs2019 and -vs2017. The steps are the same as for Visual Studio 2022. +vs2017. The steps are the same as for Visual Studio 2022. Adjust for +sub-directory when setting PATH: + + set "PATH=%cd%\zint\win32\vs2019\Release;%PATH%" + set "PATH=%cd%\zint\win32\vs2017\Release;%PATH%" Visual Studio 2015 @@ -117,6 +117,9 @@ e.g. (adjust for version): Recent versions of Qt no longer supply a specific component for Visual Studio 2015 32-bit, but you can use "MSVC 2019 32-bit" instead as it's compatible. +Adjust for sub-directory when setting PATH: + + set "PATH=%cd%\zint\win32\vs2015\Release;%PATH%" For information on building a standalone version of Zint Studio using Visual Studio 2015, see "frontend_qt\howto_build_qzint_using_msvs2015.txt" @@ -134,17 +137,12 @@ CMake needs to be able to find zlib, lpng and gs1encoders. One way to do this (requires Administrator privileges) is to create two sub-directories in "C:\Program Files (x86)" called "include" and "lib", and then copy: - for %I in (zlib\zlib.h zlib\zconf.h ^ - lpng\png.h lpng\pngconf.h lpng\pnglibconf.h ^ - gs1-syntax-engine\src\c-lib\build\library\Win32\Release\gs1encoders.h) ^ - do copy %I "C:\Program Files (x86)\include" + for %I in (zlib\zlib.h zlib\zconf.h lpng\png.h lpng\pngconf.h ^ + lpng\pnglibconf.h gs1-syntax-engine\src\c-lib\gs1encoders.h) ^ + do copy %I "C:\Program Files (x86)\include" for %I in (zlib\zlib.lib lpng\libpng.lib ^ - gs1-syntax-engine\src\c-lib\build\library\Win32\Release\gs1encoders.lib) ^ - do copy %I "C:\Program Files (x86)\lib" - -and add the location of gs1encoders.dll to your path: - - set "PATH=%cd%\gs1-syntax-engine\src\c-lib\build\library\Win32\Release;%PATH%" + gs1-syntax-engine\src\c-lib\gs1encoders.lib) ^ + do copy %I "C:\Program Files (x86)\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): @@ -178,7 +176,8 @@ equivalents are: Visual C++ 6 ------------ -The zint library and command line tool can be built using VC6. +The zint library and command line tool can be built using VC6 (but not with GS1 +Syntax Engine support). See "win32\zint_cmdline_vc6\readme.txt" diff --git a/win32/libzint.vcxproj b/win32/libzint.vcxproj index 2a948fd6..28fccc33 100644 --- a/win32/libzint.vcxproj +++ b/win32/libzint.vcxproj @@ -19,14 +19,14 @@ DynamicLibrary - v142 + v143 MultiByte false DynamicLibrary MultiByte - v142 + v143 @@ -56,8 +56,8 @@ Disabled - ..\..\zlib;..\..\lpng;..\..\gs1-syntax-engine\src\c-lib\build\library\Win32\Release;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + ..\..\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.15.0.9";DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -76,9 +76,9 @@ false - libpng.lib;zlib.lib;gs1encoders.lib;%(AdditionalDependencies) + zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\lpng;..\..\zlib;..\..\gs1-syntax-engine\src\c-lib\build\library\Win32\Release;%(AdditionalLibraryDirectories) + ..\..\zlib;..\..\lpng;..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories) libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true Windows @@ -90,8 +90,8 @@ MaxSpeed false - ..\..\zlib;..\..\lpng;..\..\gs1-syntax-engine\src\c-lib\build\library\Win32\Release;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_HAVE_GS1SE;ZINT_VERSION="2.15.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + ..\..\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.15.0.9";%(PreprocessorDefinitions) true MultiThreadedDLL @@ -109,9 +109,9 @@ false - libpng.lib;zlib.lib;gs1encoders.lib;%(AdditionalDependencies) + zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\lpng;..\..\zlib;..\..\gs1-syntax-engine\src\c-lib\build\library\Win32\Release;%(AdditionalLibraryDirectories) + ..\..\zlib;..\..\lpng;..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories) false Windows true diff --git a/win32/vs2015/libzint.vcxproj b/win32/vs2015/libzint.vcxproj index 9fa46a43..1fe969e0 100644 --- a/win32/vs2015/libzint.vcxproj +++ b/win32/vs2015/libzint.vcxproj @@ -116,8 +116,8 @@ Disabled - ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";ZINT_NO_PNG;BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) + ..\..\..\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.15.0.9";DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -138,7 +138,7 @@ %(AdditionalDependencies) $(OutDir)zintd.dll - ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true Windows @@ -148,8 +148,8 @@ Disabled - ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) - ZINT_NO_PNG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) + ..\..\..\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.15.0.9";DEBUG;%(PreprocessorDefinitions) EnableFastChecks @@ -171,7 +171,7 @@ zlibd.lib;%(AdditionalDependencies) $(OutDir)zintd.dll - ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true Windows @@ -181,8 +181,8 @@ MaxSpeed false - ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;ZINT_NO_PNG;%(PreprocessorDefinitions) + ..\..\..\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.15.0.9";%(PreprocessorDefinitions) true MultiThreadedDLL @@ -200,9 +200,9 @@ false - libpng.lib;zlib.lib;%(AdditionalDependencies) + zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories) false Windows true @@ -214,8 +214,8 @@ MaxSpeed false - ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";BUILD_ZINT_DLL;ZINT_NO_PNG;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions) + ..\..\..\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.15.0.9";%(PreprocessorDefinitions) true @@ -236,9 +236,9 @@ false - libpng.lib;zlib.lib;%(AdditionalDependencies) + zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories) false Windows true @@ -249,8 +249,8 @@ MaxSpeed false - ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions) + ..\..\..\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.15.0.9";%(PreprocessorDefinitions) true MultiThreadedDLL @@ -272,8 +272,8 @@ MaxSpeed false - ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";%(PreprocessorDefinitions) + ..\..\..\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.15.0.9";%(PreprocessorDefinitions) true diff --git a/win32/vs2017/libzint.vcxproj b/win32/vs2017/libzint.vcxproj index b489df09..b9da463d 100644 --- a/win32/vs2017/libzint.vcxproj +++ b/win32/vs2017/libzint.vcxproj @@ -56,8 +56,8 @@ Disabled - ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + ..\..\..\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.15.0.9";DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -76,9 +76,9 @@ false - libpng.lib;zlib.lib;%(AdditionalDependencies) + zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories) libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true Windows @@ -90,8 +90,8 @@ MaxSpeed false - ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + ..\..\..\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.15.0.9";%(PreprocessorDefinitions) true MultiThreadedDLL @@ -109,9 +109,9 @@ false - libpng.lib;zlib.lib;%(AdditionalDependencies) + zlib.lib;libpng.lib;gs1encoders.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories) false Windows true diff --git a/win32/vs2019/libzint.vcxproj b/win32/vs2019/libzint.vcxproj index e6d17ef8..84aa4460 100644 --- a/win32/vs2019/libzint.vcxproj +++ b/win32/vs2019/libzint.vcxproj @@ -56,8 +56,8 @@ Disabled - ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + ..\..\..\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.15.0.9";DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -78,7 +78,7 @@ libpng.lib;zlib.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories) libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true Windows @@ -90,8 +90,8 @@ MaxSpeed false - ..\..\..\zlib;..\..\..\lpng;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.15.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + ..\..\..\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.15.0.9";%(PreprocessorDefinitions) true MultiThreadedDLL @@ -111,7 +111,7 @@ libpng.lib;zlib.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\lpng;..\..\..\zlib;%(AdditionalLibraryDirectories) + ..\..\..\zlib;..\..\..\lpng;..\..\..\gs1-syntax-engine\src\c-lib;%(AdditionalLibraryDirectories) false Windows true diff --git a/win32/zint.vcxproj b/win32/zint.vcxproj index a7c72d47..94e866c9 100644 --- a/win32/zint.vcxproj +++ b/win32/zint.vcxproj @@ -19,7 +19,7 @@ Application - v142 + v143 MultiByte false @@ -104,4 +104,4 @@ - \ No newline at end of file +