Rebuild tcl windows build system

This commit is contained in:
Harald Oehlmann 2025-01-21 18:07:19 +01:00
parent 9e7b0290b4
commit 60e1c76858
5 changed files with 52 additions and 17 deletions

View file

@ -15,7 +15,7 @@ There are 3 build environments available:
- configure based build system for Linux/MacOS/MSYS/CYGWIN (Windows) - configure based build system for Linux/MacOS/MSYS/CYGWIN (Windows)
Contributed by Christian Werner. Contributed by Christian Werner.
- win/Makefile.vc for TCL/Tk MS-Visual Studio build environment - 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: Usage:

View file

@ -36,12 +36,18 @@ BACKEND_DIR = $(ROOT)\..\backend
PRJ_OBJS = \ PRJ_OBJS = \
$(TMP_DIR)\zint.obj \ $(TMP_DIR)\zint.obj \
$(TMP_DIR)\2of5.obj \ $(TMP_DIR)\2of5.obj \
$(TMP_DIR)\2of5inter.obj \
$(TMP_DIR)\2of5inter_based.obj \
$(TMP_DIR)\auspost.obj \ $(TMP_DIR)\auspost.obj \
$(TMP_DIR)\aztec.obj \ $(TMP_DIR)\aztec.obj \
$(TMP_DIR)\bc412.obj \ $(TMP_DIR)\bc412.obj \
$(TMP_DIR)\bmp.obj \ $(TMP_DIR)\bmp.obj \
$(TMP_DIR)\channel.obj \
$(TMP_DIR)\codabar.obj \
$(TMP_DIR)\codablock.obj \ $(TMP_DIR)\codablock.obj \
$(TMP_DIR)\code11.obj \
$(TMP_DIR)\code128.obj \ $(TMP_DIR)\code128.obj \
$(TMP_DIR)\code128_based.obj \
$(TMP_DIR)\code16k.obj \ $(TMP_DIR)\code16k.obj \
$(TMP_DIR)\code1.obj \ $(TMP_DIR)\code1.obj \
$(TMP_DIR)\code49.obj \ $(TMP_DIR)\code49.obj \

View file

@ -678,7 +678,7 @@ DLLEXPORT int Zint_Init (Tcl_Interp *interp)
Tcl_CallWhenDeleted(interp, InterpCleanupProc, (ClientData)tkFlagPtr); Tcl_CallWhenDeleted(interp, InterpCleanupProc, (ClientData)tkFlagPtr);
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
/* FIXME: to unload even on command rename, capture the tolken, put it in */ /* 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_CreateObjCommand(interp, "zint", ZintCmd, (ClientData)tkFlagPtr,
(Tcl_CmdDeleteProc *)NULL); (Tcl_CmdDeleteProc *)NULL);
Tcl_PkgProvide (interp, "zint", version_string); Tcl_PkgProvide (interp, "zint", version_string);

View file

@ -18,13 +18,13 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
@ -52,22 +52,22 @@
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<InlineFunctionExpansion>Default</InlineFunctionExpansion> <InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FunctionLevelLinking>false</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\backend;C:\myprograms\tcl9.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;PACKAGE_VERSION="2.13.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Debug\</AssemblerListingLocation> <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation> <BrowseInformation>true</BrowseInformation>
<PrecompiledHeaderOutputFile>.\Debug\zint_tcl.pch</PrecompiledHeaderOutputFile> <PrecompiledHeaderOutputFile>.\Debug\zint_tcl.pch</PrecompiledHeaderOutputFile>
<ObjectFileName>.\Debug\</ObjectFileName> <ObjectFileName>.\Debug\</ObjectFileName>
<ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName> <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
<AdditionalOptions> /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions>
</AdditionalOptions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile> </ClCompile>
<Midl> <Midl>
@ -92,8 +92,8 @@
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<OutputFile>Debug/zint.dll</OutputFile> <OutputFile>Debug/zint.dll</OutputFile>
<ImportLibrary>.\Debug\zint.lib</ImportLibrary> <ImportLibrary>.\Debug\zint.lib</ImportLibrary>
<AdditionalLibraryDirectories>C:\Tcl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>C:\myprograms\tcl9.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;tclstub85.lib;tkstub85.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>odbc32.lib;odbccp32.lib;tclstub.lib;tkstub.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -105,14 +105,15 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\backend;C:\myprograms\tcl9.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;PACKAGE_VERSION="2.13.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Release\</AssemblerListingLocation> <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation> <BrowseInformation>true</BrowseInformation>
<PrecompiledHeaderOutputFile>.\Release\zint_tcl.pch</PrecompiledHeaderOutputFile> <PrecompiledHeaderOutputFile>.\Release\zint_tcl.pch</PrecompiledHeaderOutputFile>
<ObjectFileName>.\Release\</ObjectFileName> <ObjectFileName>.\Release\</ObjectFileName>
<ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName> <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
<AdditionalOptions> /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions>
</AdditionalOptions>
</ClCompile> </ClCompile>
<Midl> <Midl>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@ -135,8 +136,8 @@
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<OutputFile>zint.dll</OutputFile> <OutputFile>zint.dll</OutputFile>
<ImportLibrary>.\Release\zint.lib</ImportLibrary> <ImportLibrary>.\Release\zint.lib</ImportLibrary>
<AdditionalLibraryDirectories>C:\Tcl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>C:\myprograms\tcl9.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;tclstub85.lib;tkstub85.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>odbc32.lib;odbccp32.lib;tclstub.lib;tkstub.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@ -144,6 +145,8 @@
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
</ClCompile> </ClCompile>
<ClCompile Include="..\backend\2of5inter.c" />
<ClCompile Include="..\backend\2of5inter_based.c" />
<ClCompile Include="..\backend\auspost.c"> <ClCompile Include="..\backend\auspost.c">
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
@ -160,6 +163,8 @@
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
</ClCompile> </ClCompile>
<ClCompile Include="..\backend\channel.c" />
<ClCompile Include="..\backend\codabar.c" />
<ClCompile Include="..\backend\codablock.c"> <ClCompile Include="..\backend\codablock.c">
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
@ -172,10 +177,12 @@
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
</ClCompile> </ClCompile>
<ClCompile Include="..\backend\code11.c" />
<ClCompile Include="..\backend\code128.c"> <ClCompile Include="..\backend\code128.c">
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
</ClCompile> </ClCompile>
<ClCompile Include="..\backend\code128_based.c" />
<ClCompile Include="..\backend\code16k.c"> <ClCompile Include="..\backend\code16k.c">
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
@ -200,6 +207,7 @@
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
</ClCompile> </ClCompile>
<ClCompile Include="..\backend\dxfilmedge.c" />
<ClCompile Include="..\backend\eci.c"> <ClCompile Include="..\backend\eci.c">
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\""</AdditionalOptions>

View file

@ -156,5 +156,26 @@
<ClCompile Include="zint.c"> <ClCompile Include="zint.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\backend\dxfilmedge.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\backend\codabar.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\backend\channel.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\backend\2of5inter.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\backend\code11.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\backend\code128_based.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\backend\2of5inter_based.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>