Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-09 21:15:57 +00:00
Code Issues Projects Releases Wiki Activity

version strings updated to 2.4.3

Browse Source
This commit is contained in:
tgotic
2011-05-16 20:06:42 +02:00
parent 6ad0a0bd70
commit e865b48c7e
15 changed files with 81 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/Makefile
View File

@@ -6,7 +6,7 @@
# make clean cleans up a previous compilation and any object or editor files
#
ZINT_VERSION:=-DZINT_VERSION=\"2.4.1\"
ZINT_VERSION:=-DZINT_VERSION=\"2.4.3.0\"
CC := gcc
@@ -26,14 +26,14 @@ POSTAL:= postal.c auspost.c imail.c
POSTAL_OBJ:= postal.o auspost.o imail.o
TWODIM:= code16k.c dmatrix.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c
TWODIM_OBJ:= code16k.o dmatrix.o pdf417.o qr.o maxicode.o composite.o aztec.o code49.o code1.o gridmtx.o
LIBS:= `libpng12-config --I_opts --L_opts --ldflags` -lz -lm
LIBS:= `libpng15-config --I_opts --L_opts --ldflags` -lz -lm
libzint: code.c code128.c 2of5.c upcean.c medical.c telepen.c plessey.c postal.c auspost.c imail.c code16k.c dmatrix.c reedsol.c pdf417.c maxicode.c rss.c common.c render.c png.c library.c ps.c qr.c large.c composite.c aztec.c gs1.c svg.c code49.c code1.c gridmtx.c
$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(ONEDIM)
$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(POSTAL)
$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(TWODIM)
$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(COMMON)
$(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.3.2 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS)
$(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.4.3 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS)
ln -s libzint.so.* libzint.so
.PHONY: install uninstall clean dist

4
backend/Makefile.mingw
View File

@@ -6,7 +6,7 @@
# make clean cleans up a previous compilation and any object or editor files
#
ZINT_VERSION:=-DZINT_VERSION=\"2.4.2\"
ZINT_VERSION:=-DZINT_VERSION=\"2.4.3.0\"
CC:= gcc -m32
@@ -15,7 +15,7 @@ AR:= ar rc
RANLIB:= ranlib
INCLUDE:= -I/mingw/include
CFLAGS:= -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall
LDFLAGS = -Wl,--major-image-version=2 -Wl,--minor-image-version=42
LDFLAGS = -Wl,--major-image-version=2 -Wl,--minor-image-version=43
RC:= windres
RCFLAGS:= -v -F pe-i386 --define GCC_WINDRES

8
backend/libzint.rc
View File

@@ -5,8 +5,8 @@ VS_VERSION_INFO VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO
#endif
FILEVERSION 2,4,1,0
PRODUCTVERSION 2,4,1,0
FILEVERSION 2,4,3,0
PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
//language ID = U.S. English, char set = Windows, Multilingual
BEGIN
VALUE "FileDescription", "libzint barcode library\0"
VALUE "FileVersion", "2.4.1.0\0"
VALUE "FileVersion", "2.4.3.0\0"
VALUE "InternalName", "zint.dll\0"
VALUE "LegalCopyright", "Copyright © 2009-2011 Robin Stuart & BogDan Vatra\0"
VALUE "OriginalFilename", "zint.dll\0"
VALUE "ProductName", "libzint\0"
VALUE "ProductVersion", "2.4.1.0\0"
VALUE "ProductVersion", "2.4.3.0\0"
VALUE "License", "GNU General Public License version 3\0"
VALUE "WWW", "http://www.sourceforge.net/projects/zint\0"
END

2
backend/zint.def
View File

@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 2.4.0
;Version 2.4.3
DllGetVersion
ZBarcode_Create

2
backend_qt4/backend_dll.pro
View File

@@ -8,7 +8,7 @@ macx{
}
TARGET = QtZint2
VERSION = 2.4.1
VERSION = 2.4.3
INCLUDEPATH += ../backend

2
backend_qt4/backend_vcx.pro
View File

@@ -4,7 +4,7 @@ win32 {
}
TARGET = QtZint2
VERSION = 2.4.2
VERSION = 2.4.3
QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305
QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305

2
frontend_qt4/mainwindow.cpp
View File

@@ -163,7 +163,7 @@ bool MainWindow::save()
void MainWindow::about()
{
QMessageBox::about(this, tr("About Zint"),
tr("<h2>Zint Barcode Studio 2.4.2</h2>"
tr("<h2>Zint Barcode Studio 2.4.3</h2>"
"<p>A free barcode generator"
"<p>Instruction manual is available from Sourceforge:"
"<p>http://www.sourceforge.net/projects/zint"

12
frontend_qt4/res/qtZint.rc
View File

@@ -5,8 +5,8 @@ VS_VERSION_INFO VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO
#endif
FILEVERSION 2,4,1,0
PRODUCTVERSION 2,4,1,0
FILEVERSION 2,4,3,0
PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
@@ -23,13 +23,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Robin Stuart & BogDan Vatra"
VALUE "FileDescription", "qtZint barcode generator"
VALUE "FileVersion", "2.4.1.0"
VALUE "FileVersion", "2.4.3.0"
VALUE "InternalName", "qtZint"
VALUE "LegalCopyright", "Copyright © 2010 Robin Stuart & BogDan Vatra"
VALUE "LegalCopyright", "Copyright © 2011 Robin Stuart & BogDan Vatra"
VALUE "License", "GNU General Public License version 3"
VALUE "OriginalFilename", "qtZint"
VALUE "ProductName", "Zint Barcode Studio"
VALUE "ProductVersion", "2.4.1.0"
VALUE "ProductVersion", "2.4.3.0"
VALUE "WWW", "http://www.zint.org.uk"
END
END
@@ -38,4 +38,4 @@ BEGIN
VALUE "Translation", 0x9, 1200
END
END
100 ICON MOVEABLE PURE LOADONCALL DISCARDABLE "zint.ico"
IDI_ICON1 ICON DISCARDABLE "zint.ico"

2
win32/vcx/libpng.props
View File

@@ -21,6 +21,6 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<LpngSrcDir>..\..\..\lpng145</LpngSrcDir>
<LpngSrcDir>..\..\..\lpng\lpng152</LpngSrcDir>
</PropertyGroup>
</Project>

22
win32/vcx/libpng.vcxproj
View File

@@ -64,29 +64,29 @@
<LinkIncremental>true</LinkIncremental>
<CustomBuildBeforeTargets>
</CustomBuildBeforeTargets>
<TargetName>$(ProjectName)14d</TargetName>
<TargetName>$(ProjectName)15d</TargetName>
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\Tmp\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildBeforeTargets />
<TargetName>$(ProjectName)14d</TargetName>
<TargetName>$(ProjectName)15d</TargetName>
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\Tmp\</IntDir>
<IntDir>$(Configuration)\png\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildBeforeTargets>
</CustomBuildBeforeTargets>
<TargetName>$(ProjectName)14</TargetName>
<TargetName>$(ProjectName)15</TargetName>
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\Tmp\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildBeforeTargets />
<TargetName>$(ProjectName)14</TargetName>
<TargetName>$(ProjectName)15</TargetName>
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\Tmp\</IntDir>
</PropertyGroup>
@@ -117,7 +117,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>zlib125d.dll.lib</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<Version>1.45</Version>
<Version>1.52</Version>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
<ProfileGuidedDatabase>
</ProfileGuidedDatabase>
@@ -135,7 +135,7 @@
<Optimization>Disabled</Optimization>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;_DEBUG:_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<FloatingPointExceptions>false</FloatingPointExceptions>
@@ -146,6 +146,12 @@
<DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ZLibSrcDir);$(LpngSrcDir)\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
<ExceptionHandling>false</ExceptionHandling>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -183,7 +189,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>zlib125.dll.lib</AdditionalDependencies>
<Version>1.45</Version>
<Version>1.52</Version>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>
</ProgramDatabaseFile>

25
win32/vcx/libzint.vcxproj
View File

@@ -65,7 +65,7 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\Tmp\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">$(Configuration)\Tmp\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">$(Configuration)\libzint\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
@@ -83,7 +83,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ZlibSrcDir);$(LpngSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.1";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.3.0";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@@ -116,7 +116,7 @@
<EnableCOMDATFolding>
</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<Version>2.41</Version>
<Version>2.430</Version>
<ModuleDefinitionFile>..\..\backend\zint.def</ModuleDefinitionFile>
<ImportLibrary>$(OutDir)$(TargetName)$(TargetExt).lib</ImportLibrary>
</Link>
@@ -125,10 +125,9 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ZlibSrcDir);$(LpngSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.1";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.3.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
<ExceptionHandling>false</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>true</SmallerTypeCheck>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -158,7 +157,7 @@
<EnableCOMDATFolding>
</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<Version>2.41</Version>
<Version>2.430</Version>
<ModuleDefinitionFile>..\..\backend\zint.def</ModuleDefinitionFile>
<ImportLibrary>$(OutDir)$(TargetName)$(TargetExt).lib</ImportLibrary>
</Link>
@@ -171,7 +170,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ZlibSrcDir);$(LpngSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.1";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.3.0";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -194,9 +193,9 @@
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
<Link>
<AdditionalDependencies>libpng14.dll.lib</AdditionalDependencies>
<AdditionalDependencies>libpng15.dll.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<Version>2.41</Version>
<Version>2.430</Version>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -214,7 +213,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ZlibSrcDir);$(LpngSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.1";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.3.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -237,9 +236,9 @@
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
<Link>
<AdditionalDependencies>libpng14.lib</AdditionalDependencies>
<AdditionalDependencies>libpng15.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<Version>2.41</Version>
<Version>2.430</Version>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem>

24
win32/vcx/zint.sln
View File

@@ -4,16 +4,10 @@ Microsoft Visual Studio Solution File, Format Version 11.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zint", "zint.vcxproj", "{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzint", "libzint.vcxproj", "{5C08DC40-8F7D-475E-AA3C-814DED735A4B}"
ProjectSection(ProjectDependencies) = postProject
{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{8F1D8958-0912-0C7E-1C07-55A823B14BA0}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{BF42ACC2-8EBE-4575-3D87-A5E8795F323E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}"
ProjectSection(ProjectDependencies) = postProject
{8F1D8958-0912-0C7E-1C07-55A823B14BA0} = {8F1D8958-0912-0C7E-1C07-55A823B14BA0}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,14 +33,14 @@ Global
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release Library|Win32.Build.0 = Release Library|Win32
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|Win32.ActiveCfg = Release|Win32
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|Win32.Build.0 = Release|Win32
{8F1D8958-0912-0C7E-1C07-55A823B14BA0}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
{8F1D8958-0912-0C7E-1C07-55A823B14BA0}.Debug Library|Win32.Build.0 = Debug Library|Win32
{8F1D8958-0912-0C7E-1C07-55A823B14BA0}.Debug|Win32.ActiveCfg = Debug|Win32
{8F1D8958-0912-0C7E-1C07-55A823B14BA0}.Debug|Win32.Build.0 = Debug|Win32
{8F1D8958-0912-0C7E-1C07-55A823B14BA0}.Release Library|Win32.ActiveCfg = Release Library|Win32
{8F1D8958-0912-0C7E-1C07-55A823B14BA0}.Release Library|Win32.Build.0 = Release Library|Win32
{8F1D8958-0912-0C7E-1C07-55A823B14BA0}.Release|Win32.ActiveCfg = Release|Win32
{8F1D8958-0912-0C7E-1C07-55A823B14BA0}.Release|Win32.Build.0 = Release|Win32
{BF42ACC2-8EBE-4575-3D87-A5E8795F323E}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
{BF42ACC2-8EBE-4575-3D87-A5E8795F323E}.Debug Library|Win32.Build.0 = Debug Library|Win32
{BF42ACC2-8EBE-4575-3D87-A5E8795F323E}.Debug|Win32.ActiveCfg = Debug|Win32
{BF42ACC2-8EBE-4575-3D87-A5E8795F323E}.Debug|Win32.Build.0 = Debug|Win32
{BF42ACC2-8EBE-4575-3D87-A5E8795F323E}.Release Library|Win32.ActiveCfg = Release Library|Win32
{BF42ACC2-8EBE-4575-3D87-A5E8795F323E}.Release Library|Win32.Build.0 = Release Library|Win32
{BF42ACC2-8EBE-4575-3D87-A5E8795F323E}.Release|Win32.ActiveCfg = Release|Win32
{BF42ACC2-8EBE-4575-3D87-A5E8795F323E}.Release|Win32.Build.0 = Release|Win32
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.Build.0 = Debug Library|Win32
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.ActiveCfg = Debug|Win32

32
win32/vcx/zint.vcxproj
View File

@@ -63,7 +63,7 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\Tmp\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">$(Configuration)\Tmp\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">$(Configuration)\zint\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\Tmp\</IntDir>
@@ -74,7 +74,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.1";ZINT_DLL;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.3.0";ZINT_DLL;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@@ -102,34 +102,36 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.1";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.3.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
<ExceptionHandling>false</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>true</SmallerTypeCheck>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
<AdditionalDependencies>zintd.lib;libpng14d.lib;zlib125.lib</AdditionalDependencies>
<AdditionalDependencies>zintd.lib;libpng15d.lib;zlib125d.lib</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<Version>2.41</Version>
<ShowProgress>NotSet</ShowProgress>
<Version>2.430</Version>
<ShowProgress>LinkVerboseLib</ShowProgress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.1";ZINT_DLL;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.3.0";ZINT_DLL;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -143,7 +145,7 @@
</DebugInformationFormat>
</ClCompile>
<Link>
<Version>2.41</Version>
<Version>2.430</Version>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -159,7 +161,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.1";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.3.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -173,12 +175,12 @@
</DebugInformationFormat>
</ClCompile>
<Link>
<Version>2.41</Version>
<Version>2.430</Version>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<SetChecksum>true</SetChecksum>
<AdditionalDependencies>zint.lib;libpng14.lib;zlib125.lib</AdditionalDependencies>
<AdditionalDependencies>zint.lib;libpng15.lib;zlib125.lib</AdditionalDependencies>
<SubSystem>Console</SubSystem>
</Link>
<ProjectReference>

10
win32/vcx/zlib.vcxproj
View File

@@ -90,8 +90,8 @@
<OutDir>$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<IntDir>$(Configuration)\Tmp\</IntDir>
<TargetName>$(ProjectName)125</TargetName>
<IntDir>$(Configuration)\zlib\</IntDir>
<TargetName>$(ProjectName)125d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<OutDir>$(Configuration)\</OutDir>
@@ -108,6 +108,12 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<BrowseInformation>false</BrowseInformation>
<ExceptionHandling>false</ExceptionHandling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>

2
zint.nsi
View File

@@ -5,7 +5,7 @@
;******************************************************************************
!define PRODUCT_NAME "Zint"
!define PRODUCT_EXE "qtZint.exe"
!define PRODUCT_VERSION "2.4.2.2"
!define PRODUCT_VERSION "2.4.3.0"
!define PRODUCT_WEB_SITE "http://www.zint.org.uk"
!define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}"