diff --git a/backend_tcl/readme.txt b/backend_tcl/readme.txt index c6ef1db1..0589851c 100644 --- a/backend_tcl/readme.txt +++ b/backend_tcl/readme.txt @@ -15,7 +15,7 @@ There are 3 build environments available: - configure based build system for Linux/MacOS/MSYS/CYGWIN (Windows) Contributed by Christian Werner. - win/Makefile.vc for TCL/Tk MS-Visual Studio build environment -- zint_tcl.vxproj for interactive VisualStudio build. +- zint_tcl.vxproj for interactive VisualStudio 2022 build. Usage: diff --git a/backend_tcl/win/makefile.vc b/backend_tcl/win/makefile.vc index 8b2c7442..9c9e7aaa 100644 --- a/backend_tcl/win/makefile.vc +++ b/backend_tcl/win/makefile.vc @@ -36,12 +36,18 @@ BACKEND_DIR = $(ROOT)\..\backend PRJ_OBJS = \ $(TMP_DIR)\zint.obj \ $(TMP_DIR)\2of5.obj \ + $(TMP_DIR)\2of5inter.obj \ + $(TMP_DIR)\2of5inter_based.obj \ $(TMP_DIR)\auspost.obj \ $(TMP_DIR)\aztec.obj \ $(TMP_DIR)\bc412.obj \ $(TMP_DIR)\bmp.obj \ + $(TMP_DIR)\channel.obj \ + $(TMP_DIR)\codabar.obj \ $(TMP_DIR)\codablock.obj \ + $(TMP_DIR)\code11.obj \ $(TMP_DIR)\code128.obj \ + $(TMP_DIR)\code128_based.obj \ $(TMP_DIR)\code16k.obj \ $(TMP_DIR)\code1.obj \ $(TMP_DIR)\code49.obj \ diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c index 276f6ddd..d57299c9 100644 --- a/backend_tcl/zint.c +++ b/backend_tcl/zint.c @@ -678,7 +678,7 @@ DLLEXPORT int Zint_Init (Tcl_Interp *interp) Tcl_CallWhenDeleted(interp, InterpCleanupProc, (ClientData)tkFlagPtr); /*------------------------------------------------------------------------*/ /* FIXME: to unload even on command rename, capture the tolken, put it in */ - */ the client data and use it to delete the command. */ + /* the client data and use it to delete the command. */ Tcl_CreateObjCommand(interp, "zint", ZintCmd, (ClientData)tkFlagPtr, (Tcl_CmdDeleteProc *)NULL); Tcl_PkgProvide (interp, "zint", version_string); diff --git a/backend_tcl/zint_tcl.vcxproj b/backend_tcl/zint_tcl.vcxproj index 0bfd512c..15e6835c 100644 --- a/backend_tcl/zint_tcl.vcxproj +++ b/backend_tcl/zint_tcl.vcxproj @@ -18,13 +18,13 @@ DynamicLibrary - v140 + v143 false MultiByte DynamicLibrary - v140 + v143 false MultiByte @@ -52,22 +52,22 @@ - MultiThreadedDLL + MultiThreadedDebugDLL Default - false + true Disabled true Level3 - true EditAndContinue - ..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;%(PreprocessorDefinitions) + ..\backend;C:\myprograms\tcl9.0\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;PACKAGE_VERSION="2.13.0";%(PreprocessorDefinitions) .\Debug\ true .\Debug\zint_tcl.pch .\Debug\ .\Debug\ - /D ZINT_VERSION="\"2.13.0.9\"" + + EnableFastChecks @@ -92,8 +92,8 @@ Console Debug/zint.dll .\Debug\zint.lib - C:\Tcl\lib;%(AdditionalLibraryDirectories) - odbc32.lib;odbccp32.lib;tclstub85.lib;tkstub85.lib;%(AdditionalDependencies) + C:\myprograms\tcl9.0\lib;%(AdditionalLibraryDirectories) + odbc32.lib;odbccp32.lib;tclstub.lib;tkstub.lib;%(AdditionalDependencies) @@ -105,14 +105,15 @@ MaxSpeed true Level3 - ..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;%(PreprocessorDefinitions) + ..\backend;C:\myprograms\tcl9.0\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;PACKAGE_VERSION="2.13.0";%(PreprocessorDefinitions) .\Release\ true .\Release\zint_tcl.pch .\Release\ .\Release\ - /D ZINT_VERSION="\"2.13.0.9\"" + + true @@ -135,8 +136,8 @@ Console zint.dll .\Release\zint.lib - C:\Tcl\lib;%(AdditionalLibraryDirectories) - odbc32.lib;odbccp32.lib;tclstub85.lib;tkstub85.lib;%(AdditionalDependencies) + C:\myprograms\tcl9.0\lib;%(AdditionalLibraryDirectories) + odbc32.lib;odbccp32.lib;tclstub.lib;tkstub.lib;%(AdditionalDependencies) @@ -144,6 +145,8 @@ /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" + + /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" @@ -160,6 +163,8 @@ /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" + + /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" @@ -172,10 +177,12 @@ /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" + /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" + /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" @@ -200,6 +207,7 @@ /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" + /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" diff --git a/backend_tcl/zint_tcl.vcxproj.filters b/backend_tcl/zint_tcl.vcxproj.filters index dcdc32f8..fa51d7c1 100644 --- a/backend_tcl/zint_tcl.vcxproj.filters +++ b/backend_tcl/zint_tcl.vcxproj.filters @@ -156,5 +156,26 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + \ No newline at end of file