diff --git a/win32/README b/win32/README new file mode 100644 index 00000000..ca50101a --- /dev/null +++ b/win32/README @@ -0,0 +1,81 @@ +Visual Studio 2017 - library and zint.exe +----------------------------------------- + +To build the zint library DLL and the command line tool "zint.exe" with PNG support: + +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). + +Make sure git and cmake are in your PATH, e.g. (your paths may differ) + + set PATH="C:\Program Files\Git\cmd";%PATH% + set PATH="C:\Program Files\CMake\bin";%PATH% + +Download zint, zlib and libpng by going to the directory you want to clone them +into: + + cd + +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 + +First build zlib: + + cd zlib + + nmake -f win32\Makefile.msc LOC="-DASMV -DASMINF=" OBJA="inffas32.obj match686.obj" + + 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^ + -H.^ + -Bbuild + + cmake --build build --config Release + + cd .. + +If you now open "\zint\win32\zint.sln" with Visual Studio +2017, you should be able to build both the Release and Debug configurations. + + +Visual Studio 2017 - qtZint.exe +------------------------------- + +TODO + + +Visual Studio 2015 +------------------ + +The solution and project files for Visual Studio 2015 have been moved to the +sub-directory vs2015 and are no longer maintained. However by copying the steps +above and adapting the settings from the Visual Studio 2017 project files (and +adding any sources missing), they should be pretty serviceable. + + +Visual C++ 6 +------------ + +See "win32\zint_cmdline_vc6\readme.txt" + + +MSYS/MINGW +---------- + +TODO diff --git a/win32/SetWindowsTargetPlatformVersion.props b/win32/SetWindowsTargetPlatformVersion.props new file mode 100644 index 00000000..81c16286 --- /dev/null +++ b/win32/SetWindowsTargetPlatformVersion.props @@ -0,0 +1,11 @@ + + + + $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0', 'ProductVersion', null, RegistryView.Registry32)) + + + $([MSBuild]::ValueOrDefault(`$(WindowsTargetPlatformVersion)`, `$(VC_WIN_SDK_VERSION)`)) + $([MSBuild]::ValueOrDefault(`$(WindowsTargetPlatformVersion)`, `$(WinSdkRegistryVersion).0`)) + $([MSBuild]::ValueOrDefault(`$(WindowsTargetPlatformVersion)`, `10.0.16299.0`)) + + diff --git a/win32/libzint.vcxproj b/win32/libzint.vcxproj index 36016868..45408ac4 100644 --- a/win32/libzint.vcxproj +++ b/win32/libzint.vcxproj @@ -1,399 +1,217 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release_LIB - Win32 - - - Release_LIB - x64 - - - Release - Win32 - - - Release - x64 - - - - {5C08DC40-8F7D-475E-AA3C-814DED735A4B} - libzint_png_qr - Win32Proj - - - - StaticLibrary - v140 - MultiByte - false - - - StaticLibrary - v140 - MultiByte - false - - - DynamicLibrary - v140 - MultiByte - false - - - DynamicLibrary - v140 - MultiByte - false - - - DynamicLibrary - MultiByte - v140 - - - DynamicLibrary - MultiByte - v140 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - - - true - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - - - false - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - - Disabled - ..\extern\libpng\include;..\extern\zlib\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.6.0";NO_PNG;BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) - true - - EnableFastChecks - true - MultiThreadedDebugDLL - false - - Level3 - ProgramDatabase - CompileAsCpp - 4018;4244;4305;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - - - false - - - %(AdditionalDependencies) - $(OutDir)zintd.dll - ..\extern\libpng\lib\x86;..\extern\zlib\lib\x86;%(AdditionalLibraryDirectories) - libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX86 - - - - - Disabled - ..\extern\libpng\include;..\extern\zlib\include;%(AdditionalIncludeDirectories) - NO_PNG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.6.0";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) - - - EnableFastChecks - true - MultiThreadedDebugDLL - false - - - Level3 - ProgramDatabase - CompileAsCpp - 4018;4244;4305;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - - - false - - - zlibd.lib;%(AdditionalDependencies) - $(OutDir)zintd.dll - ..\extern\libpng\lib\x64;..\extern\zlib\lib\x64;%(AdditionalLibraryDirectories) - libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - - - - - MaxSpeed - false - ..\extern\libpng\include;..\extern\zlib\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.6.0";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;NO_PNG;%(PreprocessorDefinitions) - true - - MultiThreadedDLL - false - false - - Level3 - - CompileAsCpp - 4018;4244;4305;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - - - false - - - libpng16.lib;zlib.lib;%(AdditionalDependencies) - $(OutDir)zint.dll - ..\extern\libpng\lib\x86;..\extern\zlib\lib\x86;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - MaxSpeed - false - ..\extern\libpng\include;..\extern\zlib\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.6.0";BUILD_ZINT_DLL;NO_PNG;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - false - - - Level3 - - - CompileAsCpp - 4018;4244;4305;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - - - false - - - libpng16.lib;zlib.lib;%(AdditionalDependencies) - $(OutDir)zint.dll - ..\extern\libpng\lib\x64;..\extern\zlib\lib\x64;%(AdditionalLibraryDirectories) - false - Windows - true - true - - - - - MaxSpeed - false - d:\opt\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.4";%(PreprocessorDefinitions) - true - - MultiThreadedDLL - false - false - - Level3 - - CompileAsCpp - 4018;4244;4305;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - - - $(OutDir)libzintMD.lib - - - - - MaxSpeed - false - ..\extern\libpng\include;..\extern\zlib\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.4";%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - false - - - Level3 - - - CompileAsCpp - 4018;4244;4305;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - - - $(OutDir)libzintMD.lib - - - - - - - - - - - - - - - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - - - - + + + + + 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.8.1";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + true + + EnableFastChecks + true + MultiThreadedDebugDLL + false + + Level3 + ProgramDatabase + CompileAsCpp + 4018;4244;4305;%(DisableSpecificWarnings) + + + _DEBUG;%(PreprocessorDefinitions) + + + false + + + libpng16_static.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir)zintd.dll + ..\..\lpng\Build\Release;..\..\zlib;%(AdditionalLibraryDirectories) + libcmtd.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.8.1";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + false + + Level3 + + CompileAsCpp + 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/libzint.vcproj b/win32/vs2008/libzint.vcproj similarity index 100% rename from win32/libzint.vcproj rename to win32/vs2008/libzint.vcproj diff --git a/win32/zint.vcproj b/win32/vs2008/zint.vcproj similarity index 100% rename from win32/zint.vcproj rename to win32/vs2008/zint.vcproj diff --git a/win32/vs2015/libzint.vcxproj b/win32/vs2015/libzint.vcxproj new file mode 100644 index 00000000..36016868 --- /dev/null +++ b/win32/vs2015/libzint.vcxproj @@ -0,0 +1,399 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release_LIB + Win32 + + + Release_LIB + x64 + + + Release + Win32 + + + Release + x64 + + + + {5C08DC40-8F7D-475E-AA3C-814DED735A4B} + libzint_png_qr + Win32Proj + + + + StaticLibrary + v140 + MultiByte + false + + + StaticLibrary + v140 + MultiByte + false + + + DynamicLibrary + v140 + MultiByte + false + + + DynamicLibrary + v140 + MultiByte + false + + + DynamicLibrary + MultiByte + v140 + + + DynamicLibrary + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + + + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + false + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\extern\libpng\include;..\extern\zlib\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.6.0";NO_PNG;BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) + true + + EnableFastChecks + true + MultiThreadedDebugDLL + false + + Level3 + ProgramDatabase + CompileAsCpp + 4018;4244;4305;%(DisableSpecificWarnings) + + + _DEBUG;%(PreprocessorDefinitions) + + + false + + + %(AdditionalDependencies) + $(OutDir)zintd.dll + ..\extern\libpng\lib\x86;..\extern\zlib\lib\x86;%(AdditionalLibraryDirectories) + libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + MachineX86 + + + + + Disabled + ..\extern\libpng\include;..\extern\zlib\include;%(AdditionalIncludeDirectories) + NO_PNG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.6.0";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) + + + EnableFastChecks + true + MultiThreadedDebugDLL + false + + + Level3 + ProgramDatabase + CompileAsCpp + 4018;4244;4305;%(DisableSpecificWarnings) + + + _DEBUG;%(PreprocessorDefinitions) + + + false + + + zlibd.lib;%(AdditionalDependencies) + $(OutDir)zintd.dll + ..\extern\libpng\lib\x64;..\extern\zlib\lib\x64;%(AdditionalLibraryDirectories) + libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + + + + + MaxSpeed + false + ..\extern\libpng\include;..\extern\zlib\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.6.0";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;NO_PNG;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + false + + Level3 + + CompileAsCpp + 4018;4244;4305;%(DisableSpecificWarnings) + + + NDEBUG;%(PreprocessorDefinitions) + + + false + + + libpng16.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir)zint.dll + ..\extern\libpng\lib\x86;..\extern\zlib\lib\x86;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + MaxSpeed + false + ..\extern\libpng\include;..\extern\zlib\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.6.0";BUILD_ZINT_DLL;NO_PNG;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions) + true + + + MultiThreadedDLL + false + false + + + Level3 + + + CompileAsCpp + 4018;4244;4305;%(DisableSpecificWarnings) + + + NDEBUG;%(PreprocessorDefinitions) + + + false + + + libpng16.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir)zint.dll + ..\extern\libpng\lib\x64;..\extern\zlib\lib\x64;%(AdditionalLibraryDirectories) + false + Windows + true + true + + + + + MaxSpeed + false + d:\opt\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.4";%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + false + + Level3 + + CompileAsCpp + 4018;4244;4305;%(DisableSpecificWarnings) + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)libzintMD.lib + + + + + MaxSpeed + false + ..\extern\libpng\include;..\extern\zlib\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.4";%(PreprocessorDefinitions) + true + + + MultiThreadedDLL + false + false + + + Level3 + + + CompileAsCpp + 4018;4244;4305;%(DisableSpecificWarnings) + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)libzintMD.lib + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + diff --git a/win32/vsx/libzintMD.vcxproj b/win32/vs2015/vsx/libzintMD.vcxproj similarity index 100% rename from win32/vsx/libzintMD.vcxproj rename to win32/vs2015/vsx/libzintMD.vcxproj diff --git a/win32/vs2015/zint.sln b/win32/vs2015/zint.sln new file mode 100644 index 00000000..f82500be --- /dev/null +++ b/win32/vs2015/zint.sln @@ -0,0 +1,53 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +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}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C246B2E9-C3A0-4505-BECA-1FDFC59C7BE5}" + ProjectSection(SolutionItems) = preProject + ..\.editorconfig = ..\.editorconfig + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_LIB|Win32 = Release_LIB|Win32 + Release_LIB|x64 = Release_LIB|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|Win32.ActiveCfg = Debug|Win32 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|Win32.Build.0 = Debug|Win32 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|x64.ActiveCfg = Debug|x64 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|x64.Build.0 = Debug|x64 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|Win32.ActiveCfg = Release_LIB|Win32 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|Win32.Build.0 = Release_LIB|Win32 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|x64.ActiveCfg = Release_LIB|x64 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|x64.Build.0 = Release_LIB|x64 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|Win32.ActiveCfg = Release|Win32 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|Win32.Build.0 = Release|Win32 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|x64.ActiveCfg = Release|x64 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|x64.Build.0 = Release|x64 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|Win32.Build.0 = Debug|Win32 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|x64.ActiveCfg = Debug|x64 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|x64.Build.0 = Debug|x64 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|Win32.ActiveCfg = Release_LIB|Win32 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|Win32.Build.0 = Release_LIB|Win32 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|x64.ActiveCfg = Release_LIB|x64 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|x64.Build.0 = Release_LIB|x64 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|Win32.ActiveCfg = Release|Win32 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|Win32.Build.0 = Release|Win32 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|x64.ActiveCfg = Release|x64 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/win32/vs2015/zint.vcxproj b/win32/vs2015/zint.vcxproj new file mode 100644 index 00000000..e5cf4b44 --- /dev/null +++ b/win32/vs2015/zint.vcxproj @@ -0,0 +1,247 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release_LIB + Win32 + + + Release_LIB + x64 + + + Release + Win32 + + + Release + x64 + + + + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770} + zint + Win32Proj + + + + Application + v140 + MultiByte + false + + + Application + v140 + MultiByte + false + + + Application + v140 + MultiByte + false + + + Application + v140 + MultiByte + false + + + Application + v140 + MultiByte + + + Application + v140 + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\backend;%(AdditionalIncludeDirectories) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";ZINT_DLL;%(PreprocessorDefinitions) + true + + EnableFastChecks + true + MultiThreadedDebugDLL + true + + Level3 + EditAndContinue + + + true + + + + + Disabled + ..\backend;%(AdditionalIncludeDirectories) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";ZINT_DLL;%(PreprocessorDefinitions) + + + EnableFastChecks + true + MultiThreadedDebugDLL + true + + + Level3 + ProgramDatabase + + + true + + + + + MaxSpeed + ..\backend;%(AdditionalIncludeDirectories) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";ZINT_DLL;%(PreprocessorDefinitions) + true + + MultiThreaded + false + false + + Level3 + + + + d:\opt\lib;%(AdditionalLibraryDirectories) + + + + + MaxSpeed + ..\backend;%(AdditionalIncludeDirectories) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";ZINT_DLL;%(PreprocessorDefinitions) + true + + + MultiThreaded + false + false + + + Level3 + + + + + d:\opt\lib;%(AdditionalLibraryDirectories) + + + + + MaxSpeed + ..\backend;%(AdditionalIncludeDirectories) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + false + + Level3 + + + + libpngMD.lib;zlibMD.lib;%(AdditionalDependencies) + d:\opt\lib;%(AdditionalLibraryDirectories) + + + + + MaxSpeed + ..\backend;%(AdditionalIncludeDirectories) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";%(PreprocessorDefinitions) + true + + + MultiThreadedDLL + false + false + + + Level3 + + + + + libpngMD.lib;zlibMD.lib;%(AdditionalDependencies) + d:\opt\lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + {5c08dc40-8f7d-475e-aa3c-814ded735a4b} + false + + + + + + \ No newline at end of file diff --git a/win32/zint.sln b/win32/zint.sln index f82500be..47fd5a9b 100644 --- a/win32/zint.sln +++ b/win32/zint.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zint", "zint.vcxproj", "{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}" EndProject @@ -15,39 +15,22 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_LIB|Win32 = Release_LIB|Win32 - Release_LIB|x64 = Release_LIB|x64 Release|Win32 = Release|Win32 - Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|Win32.ActiveCfg = Debug|Win32 {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|Win32.Build.0 = Debug|Win32 - {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|x64.ActiveCfg = Debug|x64 - {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|x64.Build.0 = Debug|x64 - {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|Win32.ActiveCfg = Release_LIB|Win32 - {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|Win32.Build.0 = Release_LIB|Win32 - {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|x64.ActiveCfg = Release_LIB|x64 - {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|x64.Build.0 = Release_LIB|x64 {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|Win32.ActiveCfg = Release|Win32 {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|Win32.Build.0 = Release|Win32 - {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|x64.ActiveCfg = Release|x64 - {3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|x64.Build.0 = Release|x64 {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|Win32.ActiveCfg = Debug|Win32 {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|Win32.Build.0 = Debug|Win32 - {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|x64.ActiveCfg = Debug|x64 - {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|x64.Build.0 = Debug|x64 - {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|Win32.ActiveCfg = Release_LIB|Win32 - {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|Win32.Build.0 = Release_LIB|Win32 - {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|x64.ActiveCfg = Release_LIB|x64 - {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|x64.Build.0 = Release_LIB|x64 {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|Win32.ActiveCfg = Release|Win32 {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|Win32.Build.0 = Release|Win32 - {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|x64.ActiveCfg = Release|x64 - {5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5F58D857-0A43-4DC0-AA25-1AD65E537C6A} + EndGlobalSection EndGlobal diff --git a/win32/zint.vcxproj b/win32/zint.vcxproj index e5cf4b44..31c34c64 100644 --- a/win32/zint.vcxproj +++ b/win32/zint.vcxproj @@ -1,247 +1,110 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release_LIB - Win32 - - - Release_LIB - x64 - - - Release - Win32 - - - Release - x64 - - - - {3169C7FA-E52C-4BFC-B7BB-E55EBA133770} - zint - Win32Proj - - - - Application - v140 - MultiByte - false - - - Application - v140 - MultiByte - false - - - Application - v140 - MultiByte - false - - - Application - v140 - MultiByte - false - - - Application - v140 - MultiByte - - - Application - v140 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - - Disabled - ..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";ZINT_DLL;%(PreprocessorDefinitions) - true - - EnableFastChecks - true - MultiThreadedDebugDLL - true - - Level3 - EditAndContinue - - - true - - - - - Disabled - ..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";ZINT_DLL;%(PreprocessorDefinitions) - - - EnableFastChecks - true - MultiThreadedDebugDLL - true - - - Level3 - ProgramDatabase - - - true - - - - - MaxSpeed - ..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";ZINT_DLL;%(PreprocessorDefinitions) - true - - MultiThreaded - false - false - - Level3 - - - - d:\opt\lib;%(AdditionalLibraryDirectories) - - - - - MaxSpeed - ..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";ZINT_DLL;%(PreprocessorDefinitions) - true - - - MultiThreaded - false - false - - - Level3 - - - - - d:\opt\lib;%(AdditionalLibraryDirectories) - - - - - MaxSpeed - ..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";%(PreprocessorDefinitions) - true - - MultiThreadedDLL - false - false - - Level3 - - - - libpngMD.lib;zlibMD.lib;%(AdditionalDependencies) - d:\opt\lib;%(AdditionalLibraryDirectories) - - - - - MaxSpeed - ..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.3.0";%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - false - - - Level3 - - - - - libpngMD.lib;zlibMD.lib;%(AdditionalDependencies) - d:\opt\lib;%(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - - {5c08dc40-8f7d-475e-aa3c-814ded735a4b} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Release + Win32 + + + + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770} + zint + Win32Proj + + + + + Application + v141 + MultiByte + false + + + Application + v141 + MultiByte + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\backend;%(AdditionalIncludeDirectories) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.8.1";ZINT_DLL;%(PreprocessorDefinitions) + true + + EnableFastChecks + true + MultiThreadedDebugDLL + true + + Level3 + EditAndContinue + + + true + + + + + MaxSpeed + ..\backend;%(AdditionalIncludeDirectories) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.8.1";ZINT_DLL;%(PreprocessorDefinitions) + true + + MultiThreaded + false + false + + Level3 + + + + d:\opt\lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + {5c08dc40-8f7d-475e-aa3c-814ded735a4b} + false + + + + + +