From cd65154a360e0808e7504cf7c5a3b24f0bf76391 Mon Sep 17 00:00:00 2001 From: Cosmin Marc Date: Thu, 25 May 2017 20:17:43 +0300 Subject: [PATCH] Update gitignore. Add to libzint.vcxproj missing files. Fix missing include in emf.c. Add x64 configuration. Change paths to point to extern folder for external libs(lipbng, zlib). Updated version in rc file. --- .gitignore | 11 ++- backend/emf.c | 1 + backend/libzint.rc | 12 +-- win32/libzint.vcxproj | 178 +++++++++++++++++++++++++++++++++++++++--- win32/zint.sln | 19 ++++- win32/zint.vcxproj | 110 +++++++++++++++++++++++++- 6 files changed, 305 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 526c4e1e..b15557ba 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,17 @@ build/ *.[ao] *.swp *.swo +*.suo +*.pro.user .directory CMakeLists.txt.user* Makefile backend/Makefile -frontend/Makefile \ No newline at end of file +frontend/Makefile +build-* +win32/*.VC.opendb +win32/*.VC.db +win32/Debug +win32/Release +win32/x64 +extern/* diff --git a/backend/emf.c b/backend/emf.c index 9865aaed..385938ea 100644 --- a/backend/emf.c +++ b/backend/emf.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "common.h" #include "emf.h" diff --git a/backend/libzint.rc b/backend/libzint.rc index 4d5b2ce2..016f3de6 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -7,8 +7,8 @@ VS_VERSION_INFO VERSIONINFO #else VS_VERSION_INFO VERSIONINFO #endif - FILEVERSION 2,3,0,0 - PRODUCTVERSION 2,3,0,0 + FILEVERSION 2,6,0,0 + PRODUCTVERSION 2,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -25,14 +25,14 @@ BEGIN //language ID = U.S. English, char set = Windows, Multilingual BEGIN VALUE "FileDescription", "libzint barcode library\0" - VALUE "FileVersion", "2.3.0.0\0" + VALUE "FileVersion", "2.6.0.0\0" VALUE "InternalName", "zint.dll\0" - VALUE "LegalCopyright", "Copyright © 2009 Robin Stuart & BogDan Vatra\0" + VALUE "LegalCopyright", "Copyright © 2017 Robin Stuart & BogDan Vatra\0" VALUE "OriginalFilename", "zint.dll\0" VALUE "ProductName", "libzint\0" - VALUE "ProductVersion", "2.3.0.0\0" + VALUE "ProductVersion", "2.6.0.0\0" VALUE "License", "BSD License version 3\0" - VALUE "WWW", "http://www.sourceforge.net/projects/zint\0" + VALUE "WWW", "http://www.sourceforge.net/projects/zint" END END BLOCK "VarFileInfo" diff --git a/win32/libzint.vcxproj b/win32/libzint.vcxproj index d1c4c86b..afa2ee2c 100644 --- a/win32/libzint.vcxproj +++ b/win32/libzint.vcxproj @@ -1,18 +1,30 @@  - + Debug Win32 + + Debug + x64 + Release_LIB Win32 + + Release_LIB + x64 + Release Win32 + + Release + x64 + {5C08DC40-8F7D-475E-AA3C-814DED735A4B} @@ -22,20 +34,37 @@ StaticLibrary - v120 + v140 + MultiByte + false + + + StaticLibrary + v140 MultiByte false DynamicLibrary - v120 + v140 + MultiByte + false + + + DynamicLibrary + v140 MultiByte false DynamicLibrary MultiByte - v110 + v140 + + + DynamicLibrary + MultiByte + v140 @@ -43,12 +72,21 @@ + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 @@ -58,11 +96,17 @@ $(Configuration)\ true + + true + $(SolutionDir)$(Configuration)\ $(Configuration)\ false + + false + $(SolutionDir)$(Configuration)\ $(Configuration)\ @@ -70,8 +114,8 @@ Disabled - ..\..\..\support\lpng169;..\..\zlib128-dll\include;%(AdditionalIncludeDirectories) - NO_PNG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.4";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) + ..\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 @@ -80,7 +124,7 @@ false Level3 - EditAndContinue + ProgramDatabase CompileAsCpp 4018;4244;4305;%(DisableSpecificWarnings) @@ -91,21 +135,54 @@ false - %(AdditionalDependencies) + libpng16d.lib;zlibd.lib;%(AdditionalDependencies) $(OutDir)zintd.dll - ..\..\..\support\lpng169\projects\visualc71\Win32_LIB_Debug;..\..\..\support\lpng169\projects\visualc71\Win32_LIB_Debug\ZLib;%(AdditionalLibraryDirectories) + ..\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 + + + libpng16d.lib;zlibd.lib;%(AdditionalDependencies) + $(OutDir)zintd.dll + ..\extern\libpng\lib\x64;..\extern\zlib\lib\x64;%(AdditionalLibraryDirectories) + libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + + MaxSpeed false - ..\..\..\support\lpng169;..\..\zlib128-dll\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.4";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions) + ..\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 @@ -124,9 +201,9 @@ false - libpng.lib;zlib.lib;%(AdditionalDependencies) + libpng16.lib;zlib.lib;%(AdditionalDependencies) $(OutDir)zint.dll - ..\..\..\support\lpng169\projects\visualc71\Win32_LIB_Release;..\..\..\support\lpng169\projects\visualc71\Win32_LIB_Release\ZLib;%(AdditionalLibraryDirectories) + ..\extern\libpng\lib\x86;..\extern\zlib\lib\x86;%(AdditionalLibraryDirectories) false Windows true @@ -134,6 +211,42 @@ 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 @@ -158,6 +271,33 @@ $(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 + + @@ -173,10 +313,12 @@ true + true + @@ -199,35 +341,45 @@ + + + + + + + + + true + true diff --git a/win32/zint.sln b/win32/zint.sln index 0860b22d..3a1de5d6 100644 --- a/win32/zint.sln +++ b/win32/zint.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +# 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 @@ -10,22 +10,37 @@ 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 diff --git a/win32/zint.vcxproj b/win32/zint.vcxproj index 920e8b32..e5cf4b44 100644 --- a/win32/zint.vcxproj +++ b/win32/zint.vcxproj @@ -1,18 +1,30 @@  - + Debug Win32 + + Debug + x64 + Release_LIB Win32 + + Release_LIB + x64 + Release Win32 + + Release + x64 + {3169C7FA-E52C-4BFC-B7BB-E55EBA133770} @@ -22,19 +34,36 @@ Application - v120 + v140 + MultiByte + false + + + Application + v140 MultiByte false Application - v120 + v140 + MultiByte + false + + + Application + v140 MultiByte false Application - v120 + v140 + MultiByte + + + Application + v140 MultiByte @@ -43,12 +72,21 @@ + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 @@ -57,6 +95,7 @@ $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ @@ -84,6 +123,26 @@ 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 @@ -102,6 +161,27 @@ 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 @@ -121,6 +201,28 @@ 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) + +