From ee3898085c8479fcf91b232aadb4bb499e193e44 Mon Sep 17 00:00:00 2001 From: Grigory Date: Tue, 8 Feb 2022 08:01:27 +0300 Subject: [PATCH] some fixes --- .gitignore | 12 ++++++++++++ .../DocFormatLib/Win32/DocFormatLib.vcxproj | 3 ++- ASCOfficeOdfFile/win32/cpcommon.vcxproj | 2 +- ASCOfficeOdfFile/win32/cpodf.vcxproj | 4 ++-- ASCOfficeOdfFile/win32/cpxml.vcxproj | 3 ++- ASCOfficeOdfFile/win32/formulasconvert.vcxproj | 3 ++- .../source/win32/OdfFormat.vcxproj | 2 +- .../source/win32/Oox2OdfConverter.vcxproj | 2 +- .../PPTFormatLib/Win32/PPTFormatLib.vcxproj | 4 ++-- ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj | 4 ++-- .../RtfFormatLib/Win32/RtfFormatLib.vcxproj | 4 ++-- .../Win32/TxtXmlFormatLib.vcxproj | 4 ++-- .../source/win32/XlsFormat.vcxproj | 4 ++-- .../source/win32/XlsXlsxConverter.vcxproj | 4 ++-- Common/3dParty/cryptopp/cryptlib.vcxproj | 8 ++++---- .../DocxFormat/Projects/DocxFormatLib.vcxproj | 6 +++--- .../DocxFormat/Projects/XlsbFormatLib.vcxproj | 4 ++-- .../xmlsec/xmlsec/tests/nssdb/cert8.db | Bin 65536 -> 0 bytes DesktopEditor/xmlsec/xmlsec/tests/nssdb/key3.db | Bin 16384 -> 0 bytes .../xmlsec/xmlsec/tests/nssdb/secmod.db | Bin 16384 -> 0 bytes OfficeCryptReader/win32/ECMACryptReader.vcxproj | 3 ++- X2tConverter/test/win32Test/X2tTest.vcxproj | 5 ++++- 22 files changed, 50 insertions(+), 31 deletions(-) delete mode 100644 DesktopEditor/xmlsec/xmlsec/tests/nssdb/cert8.db delete mode 100644 DesktopEditor/xmlsec/xmlsec/tests/nssdb/key3.db delete mode 100644 DesktopEditor/xmlsec/xmlsec/tests/nssdb/secmod.db diff --git a/.gitignore b/.gitignore index 2f6baa59f6..383eda0ce0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,15 @@ Thumbs.db *.dat *.txt *.log + +*.ipch +*.ipch +*.ipch + +*.db-wal + +*.db-shm + +*.db + +*.opendb diff --git a/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcxproj b/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcxproj index 240296974f..d1275e12cf 100644 --- a/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcxproj +++ b/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcxproj @@ -88,7 +88,7 @@ Disabled - %(AdditionalIncludeDirectories) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -121,6 +121,7 @@ Level3 ProgramDatabase + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) diff --git a/ASCOfficeOdfFile/win32/cpcommon.vcxproj b/ASCOfficeOdfFile/win32/cpcommon.vcxproj index 7d44b31f94..6f344eb833 100644 --- a/ASCOfficeOdfFile/win32/cpcommon.vcxproj +++ b/ASCOfficeOdfFile/win32/cpcommon.vcxproj @@ -89,7 +89,7 @@ Disabled - ../include;../../Common/3dParty/boost\build\win_32/include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\ASCOfficeOdfFile\include;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/ASCOfficeOdfFile/win32/cpodf.vcxproj b/ASCOfficeOdfFile/win32/cpodf.vcxproj index 5d756ddccf..71a3729bd9 100644 --- a/ASCOfficeOdfFile/win32/cpodf.vcxproj +++ b/ASCOfficeOdfFile/win32/cpodf.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\include;..\..\DesktopEditor\xml\libxml2\include;%(AdditionalIncludeDirectories) + C:\_Work\core\ASCOfficeOdfFile\include;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;_DEBUG;_CONSOLE;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;%(PreprocessorDefinitions) true EnableFastChecks @@ -128,7 +128,7 @@ Speed - ../include;../../DesktopEditor/freetype-2.5.2/include;%(AdditionalIncludeDirectories) + C:\_Work\core\ASCOfficeOdfFile\include;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/ASCOfficeOdfFile/win32/cpxml.vcxproj b/ASCOfficeOdfFile/win32/cpxml.vcxproj index c1d260c848..550c728715 100644 --- a/ASCOfficeOdfFile/win32/cpxml.vcxproj +++ b/ASCOfficeOdfFile/win32/cpxml.vcxproj @@ -89,7 +89,7 @@ Disabled - ../../DesktopEditor/xml/libxml2/include;../../DesktopEditor/xml/build/vs2005;%(AdditionalIncludeDirectories) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;_DEBUG;_CONSOLE;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;%(PreprocessorDefinitions) true EnableFastChecks @@ -135,6 +135,7 @@ Level3 ProgramDatabase 4311;4267;4996;4172;%(DisableSpecificWarnings) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) $(OutDir)$(ProjectName)-static.lib diff --git a/ASCOfficeOdfFile/win32/formulasconvert.vcxproj b/ASCOfficeOdfFile/win32/formulasconvert.vcxproj index cbeb6361c6..d519eb6ade 100644 --- a/ASCOfficeOdfFile/win32/formulasconvert.vcxproj +++ b/ASCOfficeOdfFile/win32/formulasconvert.vcxproj @@ -88,7 +88,7 @@ Disabled - ..\include;%(AdditionalIncludeDirectories) + C:\_Work\core\ASCOfficeOdfFile\include;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) true EnableFastChecks MultiThreadedDebugDLL @@ -124,6 +124,7 @@ Level3 ProgramDatabase 4311;4267;4996;4172;%(DisableSpecificWarnings) + C:\_Work\core\ASCOfficeOdfFile\include;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) $(OutDir)$(ProjectName).lib diff --git a/ASCOfficeOdfFileW/source/win32/OdfFormat.vcxproj b/ASCOfficeOdfFileW/source/win32/OdfFormat.vcxproj index d0176c9435..95bb95cf72 100644 --- a/ASCOfficeOdfFileW/source/win32/OdfFormat.vcxproj +++ b/ASCOfficeOdfFileW/source/win32/OdfFormat.vcxproj @@ -89,7 +89,7 @@ Disabled - ../../../ASCOfficeOdfFile\src\odf\datatypes;../../../ASCOfficeOdfFile\include;../../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\ASCOfficeOdfFile\src\odf\datatypes;C:\_Work\core\ASCOfficeOdfFile\include;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) _DEBUG;_LIB;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcxproj b/ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcxproj index 4608736ac9..414f7dcc13 100644 --- a/ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcxproj +++ b/ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcxproj @@ -88,7 +88,7 @@ Disabled - ../../../ASCOfficeOdfFile\src\odf\datatypes;../../../ASCOfficeOdfFile\include;../../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\ASCOfficeOdfFile\src\odf\datatypes;C:\_Work\core\ASCOfficeOdfFile\include;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) NDEBUG;_LIB;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj b/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj index 5f2bd1be0f..744de7e729 100644 --- a/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj +++ b/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj @@ -100,7 +100,7 @@ Disabled - ../../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) _DEBUG;_LIB;_USE_MATH_DEFINES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -175,7 +175,7 @@ MaxSpeed - C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) NDEBUG;_LIB;_USE_MATH_DEFINES;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;PPT_FORMAT;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;BUILD_CONFIG_FULL_VERSION;_PRESENTATION_WRITER_;_SVG_CONVERT_TO_IMAGE_;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj index c48679f610..af62092b83 100644 --- a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj +++ b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj @@ -92,7 +92,7 @@ Disabled - ../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -132,7 +132,7 @@ MaxSpeed Speed false - C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) NDEBUG;_LIB;_USE_MATH_DEFINES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcxproj b/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcxproj index 843e6765c8..a5f436b1bc 100644 --- a/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcxproj +++ b/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcxproj @@ -86,7 +86,7 @@ Disabled - ../../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -119,7 +119,7 @@ Level3 ProgramDatabase - C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) diff --git a/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcxproj b/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcxproj index 3c29f523cb..92a618827a 100644 --- a/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcxproj +++ b/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcxproj @@ -89,7 +89,7 @@ Disabled - ../../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -120,7 +120,7 @@ - C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;NDEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/ASCOfficeXlsFile2/source/win32/XlsFormat.vcxproj b/ASCOfficeXlsFile2/source/win32/XlsFormat.vcxproj index d150cd1d52..06e8213e51 100644 --- a/ASCOfficeXlsFile2/source/win32/XlsFormat.vcxproj +++ b/ASCOfficeXlsFile2/source/win32/XlsFormat.vcxproj @@ -87,7 +87,7 @@ Disabled - ..\XlsFormat;..\Common; ../../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + ..\XlsFormat;..\Common;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;_DEBUG;_LIB;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +118,7 @@ - ..\XlsFormat;..\Common; C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + ..\XlsFormat;..\Common;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;NDEBUG;_LIB;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/ASCOfficeXlsFile2/source/win32/XlsXlsxConverter.vcxproj b/ASCOfficeXlsFile2/source/win32/XlsXlsxConverter.vcxproj index a21bc4b3cb..60eea8d6d6 100644 --- a/ASCOfficeXlsFile2/source/win32/XlsXlsxConverter.vcxproj +++ b/ASCOfficeXlsFile2/source/win32/XlsXlsxConverter.vcxproj @@ -86,7 +86,7 @@ Disabled - ..\XlsFormat; ..\Common; ../../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + ..\XlsFormat; ..\Common;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;_DEBUG;_LIB;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -116,7 +116,7 @@ - ..\XlsFormat; ..\Common; C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + ..\XlsFormat; ..\Common;C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/Common/3dParty/cryptopp/cryptlib.vcxproj b/Common/3dParty/cryptopp/cryptlib.vcxproj index 761f1455d0..c567c6c886 100644 --- a/Common/3dParty/cryptopp/cryptlib.vcxproj +++ b/Common/3dParty/cryptopp/cryptlib.vcxproj @@ -176,7 +176,7 @@ Level4 true ProgramDatabase - C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) 0x0409 @@ -225,7 +225,7 @@ Level4 true ProgramDatabase - C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) 0x0409 @@ -275,7 +275,7 @@ true ProgramDatabase 4005;4311;4312;%(DisableSpecificWarnings) - ../../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) 0x0409 @@ -317,7 +317,7 @@ Level4 true ProgramDatabase - C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) 0x0409 diff --git a/Common/DocxFormat/Projects/DocxFormatLib.vcxproj b/Common/DocxFormat/Projects/DocxFormatLib.vcxproj index 484f8a47ee..7853bebd23 100644 --- a/Common/DocxFormat/Projects/DocxFormatLib.vcxproj +++ b/Common/DocxFormat/Projects/DocxFormatLib.vcxproj @@ -125,7 +125,7 @@ Disabled - ../../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) _USE_LIBXML2_READER_;LIBXML_READER_ENABLED;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -166,7 +166,7 @@ MaxSpeed true - C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) _USE_LIBXML2_READER_;LIBXML_READER_ENABLED;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -195,7 +195,7 @@ MaxSpeed true - C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) USE_LITE_READER;_USE_XMLLITE_READER_;_DOCWRAPPER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_OPENSOURCE_VERSION;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/Common/DocxFormat/Projects/XlsbFormatLib.vcxproj b/Common/DocxFormat/Projects/XlsbFormatLib.vcxproj index fe54126237..9570c1c304 100644 --- a/Common/DocxFormat/Projects/XlsbFormatLib.vcxproj +++ b/Common/DocxFormat/Projects/XlsbFormatLib.vcxproj @@ -1295,7 +1295,7 @@ Level3 Disabled WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) - ../../../Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) Windows @@ -1322,7 +1322,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) Windows diff --git a/DesktopEditor/xmlsec/xmlsec/tests/nssdb/cert8.db b/DesktopEditor/xmlsec/xmlsec/tests/nssdb/cert8.db deleted file mode 100644 index ac40a3325724b598ba93a314d250bd03eb7f479f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65536 zcmeI)F$w}P5CFjS6uHXI_nfb=x3I9e1Fe0AAM*=#)`FF2lC!k)NHq&fmLz1uJYZwF z-bF+cvA9NTQW>j=Sz2;N`z_LW*_fBL9F3PQ{rQ&ma^yQXt4BNjr+Qxv2@oJafB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+z*GWFJiAACPx%%E2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+Kt+Kz4G-AvkEg@XPc=rs zI|K+2AV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!Cs>0;V~Cm~CwGF4f>;DBEG+~vpjenz z5aSbECxoZV-iz2!cW#WI5JkB>O;M% z7u8YcCcg;;5I_I{1Q0*~0R#|0009ILNLIkkTixEnu=IW#?m3<7%Y~~A$&}jF_9$m% z=Pmo`{%C!*cykgKRyMyTRlTo+;L!88%e9?)t=WHemx_M)c-J@!D}&SJhU;xgDmAby}w{j@5r%RhM`r7DuSJ>~??kF}rRS&OP zYoqOHbLTON^X&XyE<^wU1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILK%g%I z19=;}@wsMSCSnc*5I_I{1Q0*~0R#|0009L0CNLBuk3U|Y&vitv8H*>^Nn$RmZD^{r zG>iExF=x}MxvKqb8MJGb)m2_BebG2Ou_g=6cF}~qxO3K;Rk;8D*o16dduQW1@i*4w uWxCur6W`%K%Z1Y)o@)MzzlM1KAP_(R0R#|0009ILKmY**5J2F+3w#1IM Disabled - %(AdditionalIncludeDirectories) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) WIN32;_DEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;%(PreprocessorDefinitions) true EnableFastChecks @@ -123,6 +123,7 @@ Level3 ProgramDatabase + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) diff --git a/X2tConverter/test/win32Test/X2tTest.vcxproj b/X2tConverter/test/win32Test/X2tTest.vcxproj index 683f95ffd3..8635de2c4b 100644 --- a/X2tConverter/test/win32Test/X2tTest.vcxproj +++ b/X2tConverter/test/win32Test/X2tTest.vcxproj @@ -92,7 +92,7 @@ Disabled - ..\..\..\DesktopEditor\agg-2.4\include;..\..\..\DesktopEditor\xml\build\vs2005;..\..\..\DesktopEditor\xml\libxml2\include;%(AdditionalIncludeDirectories) + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) _RWSTD_NO_SETRLIMIT;WIN32;_DEBUG;_CONSOLE;FILE_FORMAT_CHECKER_WITH_MACRO;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -106,6 +106,7 @@ true Console MachineX86 + C:\_Work\core\Common\3dParty\boost\build\win_32\lib @@ -136,6 +137,7 @@ Level3 ProgramDatabase + C:\_Work\core\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) true @@ -143,6 +145,7 @@ true true MachineX86 + C:\_Work\core\Common\3dParty\boost\build\win_32\lib