From 7d03d101523bca15ab76bd037c267d9a6d1e553d Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Tue, 10 Nov 2015 18:39:58 +0300 Subject: [PATCH 01/44] vcxproj files copied from scripts directory --- msvc/pugixml_vs2010.vcxproj | 191 +++++++++++++++++++++++++++++ msvc/pugixml_vs2010_static.vcxproj | 191 +++++++++++++++++++++++++++++ msvc/pugixml_vs2015.vcxproj | 172 ++++++++++++++++++++++++++ 3 files changed, 554 insertions(+) create mode 100644 msvc/pugixml_vs2010.vcxproj create mode 100644 msvc/pugixml_vs2010_static.vcxproj create mode 100644 msvc/pugixml_vs2015.vcxproj diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj new file mode 100644 index 0000000..c29b4c5 --- /dev/null +++ b/msvc/pugixml_vs2010.vcxproj @@ -0,0 +1,191 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {89A1E353-E2DC-495C-B403-742BE206ACED} + pugixml + Win32Proj + + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + true + false + + + StaticLibrary + MultiByte + true + false + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + vs2010\x32\ + vs2010\x32\Debug\ + pugixmld + vs2010\x64\ + vs2010\x64\Debug\ + pugixmld + vs2010\x32\ + vs2010\x32\Release\ + pugixml + vs2010\x64\ + vs2010\x64\Release\ + pugixml + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + true + + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmld.lib + + + Windows + true + $(OutDir)pugixmld.pdb + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + true + + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmld.lib + + + Windows + true + $(OutDir)pugixmld.pdb + + + + + Full + NDEBUG;%(PreprocessorDefinitions) + false + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixml.lib + + + Windows + true + true + true + $(OutDir)pugixml.pdb + + + + + Full + NDEBUG;%(PreprocessorDefinitions) + false + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixml.lib + + + Windows + true + true + true + $(OutDir)pugixml.pdb + + + + + + + + + + + + + + diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj new file mode 100644 index 0000000..c1e133c --- /dev/null +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -0,0 +1,191 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {89A1E353-E2DC-495C-B403-742BE206ACED} + pugixml + Win32Proj + + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + true + false + + + StaticLibrary + MultiByte + true + false + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + vs2010\x32\ + vs2010\x32\DebugStatic\ + pugixmlsd + vs2010\x64\ + vs2010\x64\DebugStatic\ + pugixmlsd + vs2010\x32\ + vs2010\x32\ReleaseStatic\ + pugixmls + vs2010\x64\ + vs2010\x64\ReleaseStatic\ + pugixmls + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmlsd.lib + + + Windows + true + $(OutDir)pugixmlsd.pdb + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmlsd.lib + + + Windows + true + $(OutDir)pugixmlsd.pdb + + + + + Full + NDEBUG;%(PreprocessorDefinitions) + false + true + MultiThreaded + true + + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmls.lib + + + Windows + true + true + true + $(OutDir)pugixmls.pdb + + + + + Full + NDEBUG;%(PreprocessorDefinitions) + false + true + MultiThreaded + true + + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmls.lib + + + Windows + true + true + true + $(OutDir)pugixmls.pdb + + + + + + + + + + + + + + diff --git a/msvc/pugixml_vs2015.vcxproj b/msvc/pugixml_vs2015.vcxproj new file mode 100644 index 0000000..e9b48f4 --- /dev/null +++ b/msvc/pugixml_vs2015.vcxproj @@ -0,0 +1,172 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {07CF01C0-B887-499D-AD9C-799CB6A9FE64} + Win32Proj + pugixml + 8.1 + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + vs2015\$(Platform)_$(Configuration)\ + vs2015\$(Platform)_$(Configuration)\ + pugixml + + + vs2015\$(Platform)_$(Configuration)\ + vs2015\$(Platform)_$(Configuration)\ + pugixml + + + vs2015\$(Platform)_$(Configuration)\ + vs2015\$(Platform)_$(Configuration)\ + pugixml + + + vs2015\$(Platform)_$(Configuration)\ + vs2015\$(Platform)_$(Configuration)\ + pugixml + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + false + + + Windows + true + + + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + false + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + + + Windows + true + true + true + + + + + + + + + + + + + \ No newline at end of file From 888d3da99dad80638db991e6b7c2d8a7b291d67f Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Wed, 11 Nov 2015 18:28:22 +0300 Subject: [PATCH 02/44] msvc_10: Added props files and solution --- msvc/props/common.debug.props | 12 +++++++++++ msvc/props/common.props | 18 +++++++++++++++++ msvc/props/common.release.props | 14 +++++++++++++ msvc/props/common.win32.props | 8 ++++++++ msvc/props/common.x64.props | 8 ++++++++ msvc/pugixml.props | 35 +++++++++++++++++++++++++++++++++ msvc/pugixml_vs2010.sln | 26 ++++++++++++++++++++++++ 7 files changed, 121 insertions(+) create mode 100644 msvc/props/common.debug.props create mode 100644 msvc/props/common.props create mode 100644 msvc/props/common.release.props create mode 100644 msvc/props/common.win32.props create mode 100644 msvc/props/common.x64.props create mode 100644 msvc/pugixml.props create mode 100644 msvc/pugixml_vs2010.sln diff --git a/msvc/props/common.debug.props b/msvc/props/common.debug.props new file mode 100644 index 0000000..5cad386 --- /dev/null +++ b/msvc/props/common.debug.props @@ -0,0 +1,12 @@ + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/msvc/props/common.props b/msvc/props/common.props new file mode 100644 index 0000000..df5d9f5 --- /dev/null +++ b/msvc/props/common.props @@ -0,0 +1,18 @@ + + + + + + vc$(PlatformToolset)\$(Platform)\$(Configuration)\ + vc$(PlatformToolset)\$(Platform)\ + + + + ProgramDatabase + Level3 + false + true + + + + diff --git a/msvc/props/common.release.props b/msvc/props/common.release.props new file mode 100644 index 0000000..bf5162d --- /dev/null +++ b/msvc/props/common.release.props @@ -0,0 +1,14 @@ + + + + + + + + Full + NDEBUG;%(PreprocessorDefinitions) + true + + + + \ No newline at end of file diff --git a/msvc/props/common.win32.props b/msvc/props/common.win32.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/common.win32.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/msvc/props/common.x64.props b/msvc/props/common.x64.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/common.x64.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/msvc/pugixml.props b/msvc/pugixml.props new file mode 100644 index 0000000..c94539d --- /dev/null +++ b/msvc/pugixml.props @@ -0,0 +1,35 @@ + + + + + + + + + $(PUGI_ProjectDir)_$(ProjectName).props + + + + + + + $(ProjectDir)props\common + + $(PUGI_CommonPropsPrefix).props + $(PUGI_CommonPropsPrefix).$(Configuration.ToLower()).props + $(PUGI_CommonPropsPrefix).$(Platform.ToLower()).props + + + + True + True + True + + + + + + + + + diff --git a/msvc/pugixml_vs2010.sln b/msvc/pugixml_vs2010.sln new file mode 100644 index 0000000..69c4477 --- /dev/null +++ b/msvc/pugixml_vs2010.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2010", "pugixml_vs2010.vcxproj", "{89A1E353-E2DC-495C-B403-742BE206ACED}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2010_static", "pugixml_vs2010_static.vcxproj", "{068BB22F-F8D8-417F-AA4A-41795D4594C6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|Win32.ActiveCfg = Debug|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|Win32.Build.0 = Debug|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|Win32.ActiveCfg = Release|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|Win32.Build.0 = Release|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|Win32.ActiveCfg = Debug|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|Win32.Build.0 = Debug|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|Win32.ActiveCfg = Release|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal From e55204a243a75fa38bc2a2a0d937a111efcceb50 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Thu, 12 Nov 2015 14:53:06 +0300 Subject: [PATCH 03/44] Added .gitignore to msvc directory --- msvc/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 msvc/.gitignore diff --git a/msvc/.gitignore b/msvc/.gitignore new file mode 100644 index 0000000..7f63024 --- /dev/null +++ b/msvc/.gitignore @@ -0,0 +1,2 @@ +*.user +*.suo From 2c7e13062f754bdb3a75b7e4d923be52a5752552 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Thu, 12 Nov 2015 14:54:27 +0300 Subject: [PATCH 04/44] msvc 2010 projects reformatted by Studio: tabs replaced by spaces, GUID changed --- msvc/pugixml_vs2010.vcxproj | 384 +++++++++++++++-------------- msvc/pugixml_vs2010_static.vcxproj | 384 +++++++++++++++-------------- 2 files changed, 388 insertions(+), 380 deletions(-) diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index c29b4c5..b36e8f1 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -1,191 +1,195 @@ - + - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {89A1E353-E2DC-495C-B403-742BE206ACED} - pugixml - Win32Proj - - - - StaticLibrary - MultiByte - true - - - StaticLibrary - MultiByte - true - - - StaticLibrary - MultiByte - true - false - - - StaticLibrary - MultiByte - true - false - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - vs2010\x32\ - vs2010\x32\Debug\ - pugixmld - vs2010\x64\ - vs2010\x64\Debug\ - pugixmld - vs2010\x32\ - vs2010\x32\Release\ - pugixml - vs2010\x64\ - vs2010\x64\Release\ - pugixml - - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - true - - Level3 - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - - - $(OutDir)pugixmld.lib - - - Windows - true - $(OutDir)pugixmld.pdb - - - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - true - - Level3 - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - - - $(OutDir)pugixmld.lib - - - Windows - true - $(OutDir)pugixmld.pdb - - - - - Full - NDEBUG;%(PreprocessorDefinitions) - false - true - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - NDEBUG;%(PreprocessorDefinitions) - - - $(OutDir)pugixml.lib - - - Windows - true - true - true - $(OutDir)pugixml.pdb - - - - - Full - NDEBUG;%(PreprocessorDefinitions) - false - true - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - NDEBUG;%(PreprocessorDefinitions) - - - $(OutDir)pugixml.lib - - - Windows - true - true - true - $(OutDir)pugixml.pdb - - - - - - - - - - - - - - + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {89A1E353-E2DC-495C-B403-742BE206ACED} + pugixml + Win32Proj + + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + true + false + + + StaticLibrary + MultiByte + true + false + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + vs2010\x32\ + vs2010\x32\Debug\ + pugixmld + vs2010\x64\ + vs2010\x64\Debug\ + pugixmld + vs2010\x32\ + vs2010\x32\Release\ + pugixml + vs2010\x64\ + vs2010\x64\Release\ + pugixml + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + true + + + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmld.lib + + + Windows + true + $(OutDir)pugixmld.pdb + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + true + + + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmld.lib + + + Windows + true + $(OutDir)pugixmld.pdb + + + + + Full + NDEBUG;%(PreprocessorDefinitions) + false + true + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixml.lib + + + Windows + true + true + true + $(OutDir)pugixml.pdb + + + + + Full + NDEBUG;%(PreprocessorDefinitions) + false + true + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixml.lib + + + Windows + true + true + true + $(OutDir)pugixml.pdb + + + + + + + + + + + + + + \ No newline at end of file diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index c1e133c..cf3d71e 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -1,191 +1,195 @@ - + - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {89A1E353-E2DC-495C-B403-742BE206ACED} - pugixml - Win32Proj - - - - StaticLibrary - MultiByte - true - - - StaticLibrary - MultiByte - true - - - StaticLibrary - MultiByte - true - false - - - StaticLibrary - MultiByte - true - false - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - vs2010\x32\ - vs2010\x32\DebugStatic\ - pugixmlsd - vs2010\x64\ - vs2010\x64\DebugStatic\ - pugixmlsd - vs2010\x32\ - vs2010\x32\ReleaseStatic\ - pugixmls - vs2010\x64\ - vs2010\x64\ReleaseStatic\ - pugixmls - - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebug - true - - Level3 - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - - - $(OutDir)pugixmlsd.lib - - - Windows - true - $(OutDir)pugixmlsd.pdb - - - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebug - true - - Level3 - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - - - $(OutDir)pugixmlsd.lib - - - Windows - true - $(OutDir)pugixmlsd.pdb - - - - - Full - NDEBUG;%(PreprocessorDefinitions) - false - true - MultiThreaded - true - - Level3 - ProgramDatabase - - - NDEBUG;%(PreprocessorDefinitions) - - - $(OutDir)pugixmls.lib - - - Windows - true - true - true - $(OutDir)pugixmls.pdb - - - - - Full - NDEBUG;%(PreprocessorDefinitions) - false - true - MultiThreaded - true - - Level3 - ProgramDatabase - - - NDEBUG;%(PreprocessorDefinitions) - - - $(OutDir)pugixmls.lib - - - Windows - true - true - true - $(OutDir)pugixmls.pdb - - - - - - - - - - - - - - + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {068BB22F-F8D8-417F-AA4A-41795D4594C6} + pugixml + Win32Proj + + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + true + false + + + StaticLibrary + MultiByte + true + false + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + vs2010\x32\ + vs2010\x32\DebugStatic\ + pugixmlsd + vs2010\x64\ + vs2010\x64\DebugStatic\ + pugixmlsd + vs2010\x32\ + vs2010\x32\ReleaseStatic\ + pugixmls + vs2010\x64\ + vs2010\x64\ReleaseStatic\ + pugixmls + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + + + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmlsd.lib + + + Windows + true + $(OutDir)pugixmlsd.pdb + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + + + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmlsd.lib + + + Windows + true + $(OutDir)pugixmlsd.pdb + + + + + Full + NDEBUG;%(PreprocessorDefinitions) + false + true + MultiThreaded + true + + + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmls.lib + + + Windows + true + true + true + $(OutDir)pugixmls.pdb + + + + + Full + NDEBUG;%(PreprocessorDefinitions) + false + true + MultiThreaded + true + + + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)pugixmls.lib + + + Windows + true + true + true + $(OutDir)pugixmls.pdb + + + + + + + + + + + + + + \ No newline at end of file From b1308655b607770d0cc7e2580c897ca80911511e Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Thu, 12 Nov 2015 18:47:00 +0300 Subject: [PATCH 05/44] Added props for static and dynamic RTL --- msvc/props/common.debug.dynamic.props | 8 ++++++++ msvc/props/common.debug.static.props | 8 ++++++++ msvc/props/common.release.dynamic.props | 8 ++++++++ msvc/props/common.release.static.props | 8 ++++++++ 4 files changed, 32 insertions(+) create mode 100644 msvc/props/common.debug.dynamic.props create mode 100644 msvc/props/common.debug.static.props create mode 100644 msvc/props/common.release.dynamic.props create mode 100644 msvc/props/common.release.static.props diff --git a/msvc/props/common.debug.dynamic.props b/msvc/props/common.debug.dynamic.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/common.debug.dynamic.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/msvc/props/common.debug.static.props b/msvc/props/common.debug.static.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/common.debug.static.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/msvc/props/common.release.dynamic.props b/msvc/props/common.release.dynamic.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/common.release.dynamic.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/msvc/props/common.release.static.props b/msvc/props/common.release.static.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/common.release.static.props @@ -0,0 +1,8 @@ + + + + + + + + From e34ec1ebcb0132a049af7594df97d6b140092ed5 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Thu, 12 Nov 2015 18:54:11 +0300 Subject: [PATCH 06/44] Support props for static /dynamic RTL --- msvc/pugixml.props | 30 ++++++++++++------------------ msvc/pugixml.s.props | 14 ++++++++++++++ msvc/pugixml_vs2010.vcxproj | 6 +++++- msvc/pugixml_vs2010_static.vcxproj | 8 ++++++++ 4 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 msvc/pugixml.s.props diff --git a/msvc/pugixml.props b/msvc/pugixml.props index c94539d..b6c6b79 100644 --- a/msvc/pugixml.props +++ b/msvc/pugixml.props @@ -2,34 +2,28 @@ - - - - $(PUGI_ProjectDir)_$(ProjectName).props + <_PUGI_Rtl_Type Condition="'$(PUGI_Use_Static_Rtl)'=='True'">static + <_PUGI_Rtl_Type Condition="'$(PUGI_Use_Static_Rtl)'!='True'">dynamic - - - + $(ProjectDir)props\common - - $(PUGI_CommonPropsPrefix).props - $(PUGI_CommonPropsPrefix).$(Configuration.ToLower()).props - $(PUGI_CommonPropsPrefix).$(Platform.ToLower()).props - True - True - True + $(PUGI_CommonPropsPrefix).props + $(PUGI_CommonPropsPrefix).$(Configuration.ToLower()).props + $(PUGI_CommonPropsPrefix).$(Platform.ToLower()).props + $(PUGI_CommonPropsPrefix).$(Configuration.ToLower()).$(_PUGI_Rtl_Type).props - - - - + + + + diff --git a/msvc/pugixml.s.props b/msvc/pugixml.s.props new file mode 100644 index 0000000..c920022 --- /dev/null +++ b/msvc/pugixml.s.props @@ -0,0 +1,14 @@ + + + + + True + + + + + + $(PUGI_Use_Static_Rtl) + + + \ No newline at end of file diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index b36e8f1..6fea81f 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -51,15 +51,19 @@ + + + + @@ -192,4 +196,4 @@ - \ No newline at end of file + diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index cf3d71e..00b036d 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -51,15 +51,23 @@ + + + + + + + + From d190d85b0fc2633016a8816130fac78d150838c0 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Thu, 12 Nov 2015 18:57:50 +0300 Subject: [PATCH 07/44] Msvc10 projects: removed some compiler settings, use inherited --- msvc/pugixml_vs2010.vcxproj | 18 +----------------- msvc/pugixml_vs2010_static.vcxproj | 16 ---------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index 6fea81f..457de48 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -85,14 +85,10 @@ Disabled _DEBUG;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebugDLL - true - Level3 - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -110,14 +106,10 @@ Disabled _DEBUG;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebugDLL - true - Level3 - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -135,14 +127,10 @@ Full NDEBUG;%(PreprocessorDefinitions) - false true MultiThreadedDLL - true - Level3 - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -162,14 +150,10 @@ Full NDEBUG;%(PreprocessorDefinitions) - false true MultiThreadedDLL - true - Level3 - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -196,4 +180,4 @@ - + \ No newline at end of file diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index 00b036d..274e83a 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -89,14 +89,10 @@ Disabled _DEBUG;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug - true - Level3 - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -114,14 +110,10 @@ Disabled _DEBUG;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug - true - Level3 - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -139,14 +131,10 @@ Full NDEBUG;%(PreprocessorDefinitions) - false true MultiThreaded - true - Level3 - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -166,14 +154,10 @@ Full NDEBUG;%(PreprocessorDefinitions) - false true MultiThreaded - true - Level3 - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) From 513eeeb847108de873fea4459b79bd9b6f2dd9b0 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Thu, 12 Nov 2015 19:04:18 +0300 Subject: [PATCH 08/44] Msvc10 projects: removed setings specific for Configuration(debug/release) --- msvc/pugixml_vs2010.vcxproj | 8 -------- msvc/pugixml_vs2010_static.vcxproj | 8 -------- 2 files changed, 16 deletions(-) diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index 457de48..1126f90 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -83,9 +83,7 @@ - Disabled _DEBUG;%(PreprocessorDefinitions) - EnableFastChecks MultiThreadedDebugDLL @@ -104,9 +102,7 @@ - Disabled _DEBUG;%(PreprocessorDefinitions) - EnableFastChecks MultiThreadedDebugDLL @@ -125,9 +121,7 @@ - Full NDEBUG;%(PreprocessorDefinitions) - true MultiThreadedDLL @@ -148,9 +142,7 @@ - Full NDEBUG;%(PreprocessorDefinitions) - true MultiThreadedDLL diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index 274e83a..3dfd91e 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -87,9 +87,7 @@ - Disabled _DEBUG;%(PreprocessorDefinitions) - EnableFastChecks MultiThreadedDebug @@ -108,9 +106,7 @@ - Disabled _DEBUG;%(PreprocessorDefinitions) - EnableFastChecks MultiThreadedDebug @@ -129,9 +125,7 @@ - Full NDEBUG;%(PreprocessorDefinitions) - true MultiThreaded @@ -152,9 +146,7 @@ - Full NDEBUG;%(PreprocessorDefinitions) - true MultiThreaded From 65154e90282a9089203e2156bc99db1131b38a78 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Thu, 12 Nov 2015 19:07:40 +0300 Subject: [PATCH 09/44] Msvc10: removed --- msvc/pugixml_vs2010.vcxproj | 4 ---- msvc/pugixml_vs2010_static.vcxproj | 4 ---- 2 files changed, 8 deletions(-) diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index 1126f90..f42eb78 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -83,7 +83,6 @@ - _DEBUG;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -102,7 +101,6 @@ - _DEBUG;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -121,7 +119,6 @@ - NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL @@ -142,7 +139,6 @@ - NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index 3dfd91e..0afd7ec 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -87,7 +87,6 @@ - _DEBUG;%(PreprocessorDefinitions) MultiThreadedDebug @@ -106,7 +105,6 @@ - _DEBUG;%(PreprocessorDefinitions) MultiThreadedDebug @@ -125,7 +123,6 @@ - NDEBUG;%(PreprocessorDefinitions) MultiThreaded @@ -146,7 +143,6 @@ - NDEBUG;%(PreprocessorDefinitions) MultiThreaded From a836c2e07c17b5436cd7ebd683a2ffd0f4b3b2a5 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Thu, 12 Nov 2015 19:11:29 +0300 Subject: [PATCH 10/44] Msvc10: removed compiler option --- msvc/pugixml_vs2010.vcxproj | 8 -------- msvc/pugixml_vs2010_static.vcxproj | 8 -------- 2 files changed, 16 deletions(-) diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index f42eb78..ef6c977 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -84,8 +84,6 @@ MultiThreadedDebugDLL - - _DEBUG;%(PreprocessorDefinitions) @@ -102,8 +100,6 @@ MultiThreadedDebugDLL - - _DEBUG;%(PreprocessorDefinitions) @@ -120,8 +116,6 @@ MultiThreadedDLL - - NDEBUG;%(PreprocessorDefinitions) @@ -140,8 +134,6 @@ MultiThreadedDLL - - NDEBUG;%(PreprocessorDefinitions) diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index 0afd7ec..65e285a 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -88,8 +88,6 @@ MultiThreadedDebug - - _DEBUG;%(PreprocessorDefinitions) @@ -106,8 +104,6 @@ MultiThreadedDebug - - _DEBUG;%(PreprocessorDefinitions) @@ -124,8 +120,6 @@ MultiThreaded - - NDEBUG;%(PreprocessorDefinitions) @@ -144,8 +138,6 @@ MultiThreaded - - NDEBUG;%(PreprocessorDefinitions) From 3ca699390e4796e4b7d8db4ebd2875537ddb872b Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 10:08:05 +0300 Subject: [PATCH 11/44] Msvc10: Moved to property shrets --- msvc/props/common.debug.dynamic.props | 8 +++++--- msvc/props/common.debug.static.props | 8 +++++--- msvc/props/common.release.dynamic.props | 8 +++++--- msvc/props/common.release.static.props | 8 +++++--- msvc/pugixml_vs2010.vcxproj | 4 ---- msvc/pugixml_vs2010_static.vcxproj | 4 ---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/msvc/props/common.debug.dynamic.props b/msvc/props/common.debug.dynamic.props index 73bc6ee..93a3964 100644 --- a/msvc/props/common.debug.dynamic.props +++ b/msvc/props/common.debug.dynamic.props @@ -1,8 +1,10 @@ - + - + + pugixmld + - + \ No newline at end of file diff --git a/msvc/props/common.debug.static.props b/msvc/props/common.debug.static.props index 73bc6ee..eb79212 100644 --- a/msvc/props/common.debug.static.props +++ b/msvc/props/common.debug.static.props @@ -1,8 +1,10 @@ - + - + + pugixmlsd + - + \ No newline at end of file diff --git a/msvc/props/common.release.dynamic.props b/msvc/props/common.release.dynamic.props index 73bc6ee..8f48f1c 100644 --- a/msvc/props/common.release.dynamic.props +++ b/msvc/props/common.release.dynamic.props @@ -1,8 +1,10 @@ - + - + + pugixml + - + \ No newline at end of file diff --git a/msvc/props/common.release.static.props b/msvc/props/common.release.static.props index 73bc6ee..38e99e5 100644 --- a/msvc/props/common.release.static.props +++ b/msvc/props/common.release.static.props @@ -1,8 +1,10 @@ - + - + + pugixmls + - + \ No newline at end of file diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index ef6c977..00f2e24 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -70,16 +70,12 @@ <_ProjectFileVersion>10.0.30319.1 vs2010\x32\ vs2010\x32\Debug\ - pugixmld vs2010\x64\ vs2010\x64\Debug\ - pugixmld vs2010\x32\ vs2010\x32\Release\ - pugixml vs2010\x64\ vs2010\x64\Release\ - pugixml diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index 65e285a..eb51884 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -74,16 +74,12 @@ <_ProjectFileVersion>10.0.30319.1 vs2010\x32\ vs2010\x32\DebugStatic\ - pugixmlsd vs2010\x64\ vs2010\x64\DebugStatic\ - pugixmlsd vs2010\x32\ vs2010\x32\ReleaseStatic\ - pugixmls vs2010\x64\ vs2010\x64\ReleaseStatic\ - pugixmls From cf7f036ba699142f3d7d3433143728a393540190 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 10:12:46 +0300 Subject: [PATCH 12/44] Msvc10: item metadata inherited --- msvc/pugixml_vs2010.vcxproj | 17 +++++------------ msvc/pugixml_vs2010_static.vcxproj | 16 ++++------------ 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index 00f2e24..af2d031 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -84,14 +84,13 @@ _DEBUG;%(PreprocessorDefinitions) - - $(OutDir)pugixmld.lib - + Windows true $(OutDir)pugixmld.pdb + @@ -100,9 +99,7 @@ _DEBUG;%(PreprocessorDefinitions) - - $(OutDir)pugixmld.lib - + Windows true @@ -116,9 +113,7 @@ NDEBUG;%(PreprocessorDefinitions) - - $(OutDir)pugixml.lib - + Windows true @@ -134,9 +129,7 @@ NDEBUG;%(PreprocessorDefinitions) - - $(OutDir)pugixml.lib - + Windows true diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index eb51884..f3fcb0a 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -88,9 +88,7 @@ _DEBUG;%(PreprocessorDefinitions) - - $(OutDir)pugixmlsd.lib - + Windows true @@ -104,9 +102,7 @@ _DEBUG;%(PreprocessorDefinitions) - - $(OutDir)pugixmlsd.lib - + Windows true @@ -120,9 +116,7 @@ NDEBUG;%(PreprocessorDefinitions) - - $(OutDir)pugixmls.lib - + Windows true @@ -138,9 +132,7 @@ NDEBUG;%(PreprocessorDefinitions) - - $(OutDir)pugixmls.lib - + Windows true From f7ad3d6ee9d60d8ed72eecc2c2432ef902b7b8d9 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 10:21:21 +0300 Subject: [PATCH 13/44] Msvc10: Moved / item metadata to props files --- msvc/props/common.debug.dynamic.props | 6 +++++- msvc/props/common.debug.static.props | 6 +++++- msvc/props/common.release.dynamic.props | 6 +++++- msvc/props/common.release.static.props | 6 +++++- msvc/pugixml_vs2010.vcxproj | 14 +------------- msvc/pugixml_vs2010_static.vcxproj | 14 +------------- 6 files changed, 22 insertions(+), 30 deletions(-) diff --git a/msvc/props/common.debug.dynamic.props b/msvc/props/common.debug.dynamic.props index 93a3964..a0ad1b6 100644 --- a/msvc/props/common.debug.dynamic.props +++ b/msvc/props/common.debug.dynamic.props @@ -5,6 +5,10 @@ pugixmld - + + + MultiThreadedDebugDLL + + \ No newline at end of file diff --git a/msvc/props/common.debug.static.props b/msvc/props/common.debug.static.props index eb79212..eebb88a 100644 --- a/msvc/props/common.debug.static.props +++ b/msvc/props/common.debug.static.props @@ -5,6 +5,10 @@ pugixmlsd - + + + MultiThreadedDebug + + \ No newline at end of file diff --git a/msvc/props/common.release.dynamic.props b/msvc/props/common.release.dynamic.props index 8f48f1c..954359f 100644 --- a/msvc/props/common.release.dynamic.props +++ b/msvc/props/common.release.dynamic.props @@ -5,6 +5,10 @@ pugixml - + + + MultiThreadedDLL + + \ No newline at end of file diff --git a/msvc/props/common.release.static.props b/msvc/props/common.release.static.props index 38e99e5..33d3014 100644 --- a/msvc/props/common.release.static.props +++ b/msvc/props/common.release.static.props @@ -5,6 +5,10 @@ pugixmls - + + + MultiThreaded + + \ No newline at end of file diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index af2d031..9a77d49 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -78,9 +78,6 @@ vs2010\x64\Release\ - - MultiThreadedDebugDLL - _DEBUG;%(PreprocessorDefinitions) @@ -93,9 +90,6 @@ - - MultiThreadedDebugDLL - _DEBUG;%(PreprocessorDefinitions) @@ -107,9 +101,6 @@ - - MultiThreadedDLL - NDEBUG;%(PreprocessorDefinitions) @@ -123,9 +114,6 @@ - - MultiThreadedDLL - NDEBUG;%(PreprocessorDefinitions) @@ -149,4 +137,4 @@ - \ No newline at end of file + diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index f3fcb0a..ea5d952 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -82,9 +82,6 @@ vs2010\x64\ReleaseStatic\ - - MultiThreadedDebug - _DEBUG;%(PreprocessorDefinitions) @@ -96,9 +93,6 @@ - - MultiThreadedDebug - _DEBUG;%(PreprocessorDefinitions) @@ -110,9 +104,6 @@ - - MultiThreaded - NDEBUG;%(PreprocessorDefinitions) @@ -126,9 +117,6 @@ - - MultiThreaded - NDEBUG;%(PreprocessorDefinitions) @@ -152,4 +140,4 @@ - \ No newline at end of file + From a5e84e3b2cfe7385065b9e07893b77565e52912a Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 10:34:10 +0300 Subject: [PATCH 14/44] < made visible --- msvc/pugixml.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/msvc/pugixml.props b/msvc/pugixml.props index b6c6b79..0f6cc81 100644 --- a/msvc/pugixml.props +++ b/msvc/pugixml.props @@ -1,10 +1,10 @@ - + - <_PUGI_Rtl_Type Condition="'$(PUGI_Use_Static_Rtl)'=='True'">static - <_PUGI_Rtl_Type Condition="'$(PUGI_Use_Static_Rtl)'!='True'">dynamic + Static + Dynamic @@ -17,7 +17,7 @@ $(PUGI_CommonPropsPrefix).props $(PUGI_CommonPropsPrefix).$(Configuration.ToLower()).props $(PUGI_CommonPropsPrefix).$(Platform.ToLower()).props - $(PUGI_CommonPropsPrefix).$(Configuration.ToLower()).$(_PUGI_Rtl_Type).props + $(PUGI_CommonPropsPrefix).$(Configuration.ToLower()).$(PUGI_Rtl_Type.ToLower()).props From 4391ececaa1ac159c11a8abbc10416350b157bfd Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 10:34:52 +0300 Subject: [PATCH 15/44] Changed and in common.props: Used PUGI_Rtl_Type --- msvc/props/common.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/msvc/props/common.props b/msvc/props/common.props index df5d9f5..af98736 100644 --- a/msvc/props/common.props +++ b/msvc/props/common.props @@ -3,8 +3,8 @@ - vc$(PlatformToolset)\$(Platform)\$(Configuration)\ - vc$(PlatformToolset)\$(Platform)\ + vc.$(PlatformToolset)\$(Platform)\$(Configuration)$(PUGI_Rtl_Type)\ + vc.$(PlatformToolset)\$(Platform)\ @@ -15,4 +15,4 @@ - + \ No newline at end of file From 258ceafe430711b4ef0fd7fba824777ca4b9c7f8 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 10:35:28 +0300 Subject: [PATCH 16/44] Msvc10: inherit properties and Signed-off-by: SeVlaT --- msvc/pugixml_vs2010.vcxproj | 10 +--------- msvc/pugixml_vs2010_static.vcxproj | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index 9a77d49..fd020f3 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -68,14 +68,6 @@ <_ProjectFileVersion>10.0.30319.1 - vs2010\x32\ - vs2010\x32\Debug\ - vs2010\x64\ - vs2010\x64\Debug\ - vs2010\x32\ - vs2010\x32\Release\ - vs2010\x64\ - vs2010\x64\Release\ @@ -137,4 +129,4 @@ - + \ No newline at end of file diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index ea5d952..02270aa 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -72,14 +72,6 @@ <_ProjectFileVersion>10.0.30319.1 - vs2010\x32\ - vs2010\x32\DebugStatic\ - vs2010\x64\ - vs2010\x64\DebugStatic\ - vs2010\x32\ - vs2010\x32\ReleaseStatic\ - vs2010\x64\ - vs2010\x64\ReleaseStatic\ @@ -140,4 +132,4 @@ - + \ No newline at end of file From 550859d7204b218c0a95648d7ae071ab3b02ec94 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 10:45:12 +0300 Subject: [PATCH 17/44] Msvc10: moved to Props --- msvc/props/common.debug.props | 3 +++ msvc/props/common.release.props | 3 +++ 2 files changed, 6 insertions(+) diff --git a/msvc/props/common.debug.props b/msvc/props/common.debug.props index 5cad386..cdea1aa 100644 --- a/msvc/props/common.debug.props +++ b/msvc/props/common.debug.props @@ -7,6 +7,9 @@ _DEBUG;%(PreprocessorDefinitions) + + _DEBUG;%(PreprocessorDefinitions) + \ No newline at end of file diff --git a/msvc/props/common.release.props b/msvc/props/common.release.props index bf5162d..589b99e 100644 --- a/msvc/props/common.release.props +++ b/msvc/props/common.release.props @@ -9,6 +9,9 @@ NDEBUG;%(PreprocessorDefinitions) true + + NDEBUG;%(PreprocessorDefinitions) + \ No newline at end of file From a768ba110e79e680369d05bbb95ec111ba24a6df Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 10:45:55 +0300 Subject: [PATCH 18/44] Msvc10: Moved to Props --- msvc/pugixml_vs2010.vcxproj | 12 ------------ msvc/pugixml_vs2010_static.vcxproj | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index fd020f3..0a1bbe1 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -70,9 +70,6 @@ <_ProjectFileVersion>10.0.30319.1 - - _DEBUG;%(PreprocessorDefinitions) - Windows @@ -82,9 +79,6 @@ - - _DEBUG;%(PreprocessorDefinitions) - Windows @@ -93,9 +87,6 @@ - - NDEBUG;%(PreprocessorDefinitions) - Windows @@ -106,9 +97,6 @@ - - NDEBUG;%(PreprocessorDefinitions) - Windows diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index 02270aa..fa4a036 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -74,9 +74,6 @@ <_ProjectFileVersion>10.0.30319.1 - - _DEBUG;%(PreprocessorDefinitions) - Windows @@ -85,9 +82,6 @@ - - _DEBUG;%(PreprocessorDefinitions) - Windows @@ -96,9 +90,6 @@ - - NDEBUG;%(PreprocessorDefinitions) - Windows @@ -109,9 +100,6 @@ - - NDEBUG;%(PreprocessorDefinitions) - Windows From ac9c0e48d67c37f5973a9027306d8125fcc9ad37 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 11:05:58 +0300 Subject: [PATCH 19/44] Moved item metadata to props --- msvc/props/common.props | 4 ++++ msvc/props/common.release.props | 4 ++++ msvc/pugixml_vs2010.vcxproj | 12 ------------ msvc/pugixml_vs2010_static.vcxproj | 12 ------------ 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/msvc/props/common.props b/msvc/props/common.props index af98736..170ef39 100644 --- a/msvc/props/common.props +++ b/msvc/props/common.props @@ -13,6 +13,10 @@ false true + + true + Windows + \ No newline at end of file diff --git a/msvc/props/common.release.props b/msvc/props/common.release.props index 589b99e..e7c61d6 100644 --- a/msvc/props/common.release.props +++ b/msvc/props/common.release.props @@ -12,6 +12,10 @@ NDEBUG;%(PreprocessorDefinitions) + + true + true + \ No newline at end of file diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index 0a1bbe1..ebec013 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -72,8 +72,6 @@ - Windows - true $(OutDir)pugixmld.pdb @@ -81,28 +79,18 @@ - Windows - true $(OutDir)pugixmld.pdb - Windows - true - true - true $(OutDir)pugixml.pdb - Windows - true - true - true $(OutDir)pugixml.pdb diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index fa4a036..3f10e70 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -76,36 +76,24 @@ - Windows - true $(OutDir)pugixmlsd.pdb - Windows - true $(OutDir)pugixmlsd.pdb - Windows - true - true - true $(OutDir)pugixmls.pdb - Windows - true - true - true $(OutDir)pugixmls.pdb From 9d7c3ebf9604d957981792e8d840f6c4eb2f7195 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 11:18:43 +0300 Subject: [PATCH 20/44] Removed item metadata. It propably erroneous. Studio uses . Is set properly bu Mycrosoft system properties --- msvc/pugixml_vs2010.vcxproj | 6 +----- msvc/pugixml_vs2010_static.vcxproj | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index ebec013..2c179fa 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -72,26 +72,22 @@ - $(OutDir)pugixmld.pdb - $(OutDir)pugixmld.pdb - $(OutDir)pugixml.pdb - $(OutDir)pugixml.pdb @@ -105,4 +101,4 @@ - \ No newline at end of file + diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index 3f10e70..0f7ee09 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -76,25 +76,21 @@ - $(OutDir)pugixmlsd.pdb - $(OutDir)pugixmlsd.pdb - $(OutDir)pugixmls.pdb - $(OutDir)pugixmls.pdb @@ -108,4 +104,4 @@ - \ No newline at end of file + From e0c2ee576cd542930c86b953173cbd1b164f9d04 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 11:24:55 +0300 Subject: [PATCH 21/44] Msvc10: cosmetic changes. Remove unnecessary empty tags --- msvc/pugixml_vs2010.vcxproj | 28 +++++----------------------- msvc/pugixml_vs2010_static.vcxproj | 27 +++++---------------------- 2 files changed, 10 insertions(+), 45 deletions(-) diff --git a/msvc/pugixml_vs2010.vcxproj b/msvc/pugixml_vs2010.vcxproj index 2c179fa..1e08ac7 100644 --- a/msvc/pugixml_vs2010.vcxproj +++ b/msvc/pugixml_vs2010.vcxproj @@ -69,34 +69,16 @@ <_ProjectFileVersion>10.0.30319.1 - - - - - - - - - - - - - - - - - - - - - + + + + - - + diff --git a/msvc/pugixml_vs2010_static.vcxproj b/msvc/pugixml_vs2010_static.vcxproj index 0f7ee09..7edb244 100644 --- a/msvc/pugixml_vs2010_static.vcxproj +++ b/msvc/pugixml_vs2010_static.vcxproj @@ -73,33 +73,16 @@ <_ProjectFileVersion>10.0.30319.1 - - - - - - - - - - - - - - - - - - - - + + + + - - + From afb646cef41a5d57a9e2a931b835025cfa9f1b2b Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 11:29:53 +0300 Subject: [PATCH 22/44] Msvc14: added solution --- msvc/pugixml_vs2015.sln | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 msvc/pugixml_vs2015.sln diff --git a/msvc/pugixml_vs2015.sln b/msvc/pugixml_vs2015.sln new file mode 100644 index 0000000..95ff34b --- /dev/null +++ b/msvc/pugixml_vs2015.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2015", "pugixml_vs2015.vcxproj", "{07CF01C0-B887-499D-AD9C-799CB6A9FE64}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Debug|x64.ActiveCfg = Debug|x64 + {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Debug|x64.Build.0 = Debug|x64 + {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Debug|x86.ActiveCfg = Debug|Win32 + {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Debug|x86.Build.0 = Debug|Win32 + {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x64.ActiveCfg = Release|x64 + {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x64.Build.0 = Release|x64 + {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x86.ActiveCfg = Release|Win32 + {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal From a4b7273ee184bbaf231b7bf2261f367b36eeaa86 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 11:34:08 +0300 Subject: [PATCH 23/44] Msvc14: --- msvc/pugixml_vs2015.vcxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/msvc/pugixml_vs2015.vcxproj b/msvc/pugixml_vs2015.vcxproj index e9b48f4..7f751cb 100644 --- a/msvc/pugixml_vs2015.vcxproj +++ b/msvc/pugixml_vs2015.vcxproj @@ -58,15 +58,19 @@ + + + + From a21e3524ec0fb2134e2c7414e1645865fd4efc6a Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 12:29:02 +0300 Subject: [PATCH 24/44] Msvc14: removed Remark: - compiler setting - linker setting Both of them probably set well by default. --- msvc/pugixml_vs2015.vcxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/msvc/pugixml_vs2015.vcxproj b/msvc/pugixml_vs2015.vcxproj index 7f751cb..0595ab9 100644 --- a/msvc/pugixml_vs2015.vcxproj +++ b/msvc/pugixml_vs2015.vcxproj @@ -100,7 +100,6 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pdb OldStyle false @@ -116,7 +115,6 @@ Level3 Disabled _DEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pdb OldStyle false @@ -134,7 +132,6 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pdb OldStyle @@ -153,7 +150,6 @@ true true NDEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pdb OldStyle From ccbfc905bf3c6f7a81d61dbcab571dbb17e97ed6 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 12:38:02 +0300 Subject: [PATCH 25/44] Msvc15: removed some compiler options, that are well-inherited from Props --- msvc/pugixml_vs2015.vcxproj | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/msvc/pugixml_vs2015.vcxproj b/msvc/pugixml_vs2015.vcxproj index 0595ab9..80b5acc 100644 --- a/msvc/pugixml_vs2015.vcxproj +++ b/msvc/pugixml_vs2015.vcxproj @@ -97,11 +97,8 @@ - Level3 - Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) OldStyle - false Windows @@ -112,11 +109,8 @@ - Level3 - Disabled _DEBUG;_LIB;%(PreprocessorDefinitions) OldStyle - false Windows @@ -125,11 +119,9 @@ - Level3 MaxSpeed - true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) OldStyle @@ -143,11 +135,9 @@ - Level3 MaxSpeed - true true NDEBUG;_LIB;%(PreprocessorDefinitions) OldStyle @@ -169,4 +159,4 @@ - \ No newline at end of file + From cdb885844670794fdae56ff0724900d65082b603 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 12:53:54 +0300 Subject: [PATCH 26/44] pugixml.props: support props, specific for MSVC version --- msvc/pugixml.props | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/msvc/pugixml.props b/msvc/pugixml.props index 0f6cc81..d1dba57 100644 --- a/msvc/pugixml.props +++ b/msvc/pugixml.props @@ -8,11 +8,14 @@ - $(ProjectDir)props\common + $(ProjectDir)props\msvc$(PlatformToolsetVersion) + + $(PUGI_CommonPropsPrefix).props $(PUGI_CommonPropsPrefix).$(Configuration.ToLower()).props @@ -20,10 +23,23 @@ $(PUGI_CommonPropsPrefix).$(Configuration.ToLower()).$(PUGI_Rtl_Type.ToLower()).props + + + $(PUGI_VcverPropsPrefix).props + $(PUGI_VcverPropsPrefix).$(Configuration.ToLower()).props + + + + + + + + + From 7bcd6c89bdbfb0c8bf3d63eee909faaced37d96e Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 12:57:50 +0300 Subject: [PATCH 27/44] Added Msvc14-specific props (yet empty) --- msvc/props/msvc140.debug.props | 8 ++++++++ msvc/props/msvc140.props | 8 ++++++++ msvc/props/msvc140.release.props | 8 ++++++++ 3 files changed, 24 insertions(+) create mode 100644 msvc/props/msvc140.debug.props create mode 100644 msvc/props/msvc140.props create mode 100644 msvc/props/msvc140.release.props diff --git a/msvc/props/msvc140.debug.props b/msvc/props/msvc140.debug.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/msvc140.debug.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/msvc/props/msvc140.props b/msvc/props/msvc140.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/msvc140.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/msvc/props/msvc140.release.props b/msvc/props/msvc140.release.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/msvc140.release.props @@ -0,0 +1,8 @@ + + + + + + + + From dade2b81c165d183e489d2b308ebeda5ae9e21e1 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 13:04:10 +0300 Subject: [PATCH 28/44] Msvc14: Moved , , , to props --- msvc/props/msvc140.props | 16 ++++++++++++---- msvc/pugixml_vs2015.vcxproj | 30 +++++------------------------- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/msvc/props/msvc140.props b/msvc/props/msvc140.props index 73bc6ee..555291e 100644 --- a/msvc/props/msvc140.props +++ b/msvc/props/msvc140.props @@ -1,8 +1,16 @@ - + - - + + pugixml + vs.$(PlatformToolset)\$(Platform)_$(Configuration)\ + vs.$(PlatformToolset)\$(Platform)_$(Configuration)\ + + + + OldStyle + + - + \ No newline at end of file diff --git a/msvc/pugixml_vs2015.vcxproj b/msvc/pugixml_vs2015.vcxproj index 80b5acc..0cb4011 100644 --- a/msvc/pugixml_vs2015.vcxproj +++ b/msvc/pugixml_vs2015.vcxproj @@ -73,32 +73,15 @@ - - vs2015\$(Platform)_$(Configuration)\ - vs2015\$(Platform)_$(Configuration)\ - pugixml - - - vs2015\$(Platform)_$(Configuration)\ - vs2015\$(Platform)_$(Configuration)\ - pugixml - - - vs2015\$(Platform)_$(Configuration)\ - vs2015\$(Platform)_$(Configuration)\ - pugixml - - - vs2015\$(Platform)_$(Configuration)\ - vs2015\$(Platform)_$(Configuration)\ - pugixml - + + + + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - OldStyle Windows @@ -110,7 +93,6 @@ _DEBUG;_LIB;%(PreprocessorDefinitions) - OldStyle Windows @@ -124,7 +106,6 @@ MaxSpeed true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - OldStyle Windows @@ -140,7 +121,6 @@ MaxSpeed true NDEBUG;_LIB;%(PreprocessorDefinitions) - OldStyle Windows @@ -159,4 +139,4 @@ - + \ No newline at end of file From 03e46219db959f1440c90173373f853a79a53a79 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 13:09:57 +0300 Subject: [PATCH 29/44] Msvc14: Inherit --- msvc/pugixml_vs2015.vcxproj | 8 -------- 1 file changed, 8 deletions(-) diff --git a/msvc/pugixml_vs2015.vcxproj b/msvc/pugixml_vs2015.vcxproj index 0cb4011..b8854c8 100644 --- a/msvc/pugixml_vs2015.vcxproj +++ b/msvc/pugixml_vs2015.vcxproj @@ -79,8 +79,6 @@ - - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) @@ -90,8 +88,6 @@ - - _DEBUG;_LIB;%(PreprocessorDefinitions) @@ -101,8 +97,6 @@ - - MaxSpeed true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) @@ -116,8 +110,6 @@ - - MaxSpeed true NDEBUG;_LIB;%(PreprocessorDefinitions) From e067e8676cb46fdbe30d1d227dfa313eba0264fe Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 13:19:26 +0300 Subject: [PATCH 30/44] Msvc14: removed _DEBUG/NDEBUG, moved some options to props --- msvc/props/msvc140.release.props | 11 ++++++++--- msvc/pugixml_vs2015.vcxproj | 12 ++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/msvc/props/msvc140.release.props b/msvc/props/msvc140.release.props index 73bc6ee..46af770 100644 --- a/msvc/props/msvc140.release.props +++ b/msvc/props/msvc140.release.props @@ -1,8 +1,13 @@ - + - + + + MaxSpeed + true + + - + \ No newline at end of file diff --git a/msvc/pugixml_vs2015.vcxproj b/msvc/pugixml_vs2015.vcxproj index b8854c8..eb6fa09 100644 --- a/msvc/pugixml_vs2015.vcxproj +++ b/msvc/pugixml_vs2015.vcxproj @@ -79,7 +79,7 @@ - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_LIB;%(PreprocessorDefinitions) Windows @@ -88,7 +88,7 @@ - _DEBUG;_LIB;%(PreprocessorDefinitions) + _LIB;%(PreprocessorDefinitions) Windows @@ -97,9 +97,7 @@ - MaxSpeed - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_LIB;%(PreprocessorDefinitions) Windows @@ -110,9 +108,7 @@ - MaxSpeed - true - NDEBUG;_LIB;%(PreprocessorDefinitions) + _LIB;%(PreprocessorDefinitions) Windows From 9a81561d99e41d57afcb9bb133e4178be57e3db7 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 13:24:16 +0300 Subject: [PATCH 31/44] pugixmpprops: support Msvc vesion and platform specific props --- msvc/pugixml.props | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/msvc/pugixml.props b/msvc/pugixml.props index d1dba57..f95835f 100644 --- a/msvc/pugixml.props +++ b/msvc/pugixml.props @@ -25,8 +25,9 @@ - $(PUGI_VcverPropsPrefix).props - $(PUGI_VcverPropsPrefix).$(Configuration.ToLower()).props + $(PUGI_VcverPropsPrefix).props + $(PUGI_VcverPropsPrefix).$(Configuration.ToLower()).props + $(PUGI_VcverPropsPrefix).$(Platform.ToLower()).props @@ -38,8 +39,9 @@ - - + + + From fbfac6d123b16438fccf81b7eea1137773ed0a64 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 13:24:38 +0300 Subject: [PATCH 32/44] Added platform-specific props for Msvc14 --- msvc/props/msvc140.win32.props | 8 ++++++++ msvc/props/msvc140.x64.props | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 msvc/props/msvc140.win32.props create mode 100644 msvc/props/msvc140.x64.props diff --git a/msvc/props/msvc140.win32.props b/msvc/props/msvc140.win32.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/msvc140.win32.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/msvc/props/msvc140.x64.props b/msvc/props/msvc140.x64.props new file mode 100644 index 0000000..73bc6ee --- /dev/null +++ b/msvc/props/msvc140.x64.props @@ -0,0 +1,8 @@ + + + + + + + + From a40b7ef192ae426af1557ee930b98822072582c9 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 13:27:52 +0300 Subject: [PATCH 33/44] Msvc14: Moved to Props --- msvc/props/msvc140.props | 1 + msvc/props/msvc140.win32.props | 10 +++++++--- msvc/pugixml_vs2015.vcxproj | 16 ++++------------ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/msvc/props/msvc140.props b/msvc/props/msvc140.props index 555291e..e60a2ae 100644 --- a/msvc/props/msvc140.props +++ b/msvc/props/msvc140.props @@ -10,6 +10,7 @@ OldStyle + _LIB;%(PreprocessorDefinitions) diff --git a/msvc/props/msvc140.win32.props b/msvc/props/msvc140.win32.props index 73bc6ee..9e37a7b 100644 --- a/msvc/props/msvc140.win32.props +++ b/msvc/props/msvc140.win32.props @@ -1,8 +1,12 @@ - + - + + + WIN32;%(PreprocessorDefinitions) + + - + \ No newline at end of file diff --git a/msvc/pugixml_vs2015.vcxproj b/msvc/pugixml_vs2015.vcxproj index eb6fa09..9212ed6 100644 --- a/msvc/pugixml_vs2015.vcxproj +++ b/msvc/pugixml_vs2015.vcxproj @@ -78,27 +78,21 @@ - - WIN32;_LIB;%(PreprocessorDefinitions) - + Windows true - - _LIB;%(PreprocessorDefinitions) - + Windows true - - WIN32;_LIB;%(PreprocessorDefinitions) - + Windows true @@ -107,9 +101,7 @@ - - _LIB;%(PreprocessorDefinitions) - + Windows true From 391725fb028027cc145a7bba9a4627b185e01ad6 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 13:35:03 +0300 Subject: [PATCH 34/44] Msvc14: inherit Linker settings --- msvc/pugixml_vs2015.vcxproj | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/msvc/pugixml_vs2015.vcxproj b/msvc/pugixml_vs2015.vcxproj index 9212ed6..cb0cae7 100644 --- a/msvc/pugixml_vs2015.vcxproj +++ b/msvc/pugixml_vs2015.vcxproj @@ -79,35 +79,21 @@ - - Windows - true - + + - - Windows - true - + + - - Windows - true - true - true - + - - Windows - true - true - true - + From 05df29c9abad305d37e3a8d61bff46d79bc8d0c1 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 14:01:41 +0300 Subject: [PATCH 35/44] msvc14: Cosmetic changes, removed empty tags --- msvc/pugixml_vs2015.vcxproj | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/msvc/pugixml_vs2015.vcxproj b/msvc/pugixml_vs2015.vcxproj index cb0cae7..ae65203 100644 --- a/msvc/pugixml_vs2015.vcxproj +++ b/msvc/pugixml_vs2015.vcxproj @@ -77,24 +77,10 @@ - - - - - - - - - - - - - - - - - - + + + + @@ -105,4 +91,4 @@ - \ No newline at end of file + From 286c32e5d5d7b65f45ea610309a2af8f28cc68a9 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 14:02:18 +0300 Subject: [PATCH 36/44] pugixml.props: support custom user property sheet --- msvc/pugixml.props | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/msvc/pugixml.props b/msvc/pugixml.props index f95835f..1e1fcae 100644 --- a/msvc/pugixml.props +++ b/msvc/pugixml.props @@ -44,4 +44,14 @@ + + + + + From 3d8ae832eea611f80355015cd49107d418e91fb3 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 14:05:58 +0300 Subject: [PATCH 37/44] added msvc2015_static.vcxproj (just by copying from msvc2015.vcxproj) --- msvc/pugixml_vs2015.sln | 10 ++++ msvc/pugixml_vs2015_static.vcxproj | 94 ++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 msvc/pugixml_vs2015_static.vcxproj diff --git a/msvc/pugixml_vs2015.sln b/msvc/pugixml_vs2015.sln index 95ff34b..7e6bfac 100644 --- a/msvc/pugixml_vs2015.sln +++ b/msvc/pugixml_vs2015.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2015", "pugixml_vs2015.vcxproj", "{07CF01C0-B887-499D-AD9C-799CB6A9FE64}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2015_static", "pugixml_vs2015_static.vcxproj", "{882E4BFF-039D-4C8F-A833-5DFCBBF6985C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -21,6 +23,14 @@ Global {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x64.Build.0 = Release|x64 {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x86.ActiveCfg = Release|Win32 {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x86.Build.0 = Release|Win32 + {882E4BFF-039D-4C8F-A833-5DFCBBF6985C}.Debug|x64.ActiveCfg = Debug|x64 + {882E4BFF-039D-4C8F-A833-5DFCBBF6985C}.Debug|x64.Build.0 = Debug|x64 + {882E4BFF-039D-4C8F-A833-5DFCBBF6985C}.Debug|x86.ActiveCfg = Debug|Win32 + {882E4BFF-039D-4C8F-A833-5DFCBBF6985C}.Debug|x86.Build.0 = Debug|Win32 + {882E4BFF-039D-4C8F-A833-5DFCBBF6985C}.Release|x64.ActiveCfg = Release|x64 + {882E4BFF-039D-4C8F-A833-5DFCBBF6985C}.Release|x64.Build.0 = Release|x64 + {882E4BFF-039D-4C8F-A833-5DFCBBF6985C}.Release|x86.ActiveCfg = Release|Win32 + {882E4BFF-039D-4C8F-A833-5DFCBBF6985C}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/msvc/pugixml_vs2015_static.vcxproj b/msvc/pugixml_vs2015_static.vcxproj new file mode 100644 index 0000000..6e7241f --- /dev/null +++ b/msvc/pugixml_vs2015_static.vcxproj @@ -0,0 +1,94 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {882E4BFF-039D-4C8F-A833-5DFCBBF6985C} + Win32Proj + pugixml + 8.1 + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From e8b1349e83f754ea2f120632a6afd7a4d97d7260 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 14:11:40 +0300 Subject: [PATCH 38/44] Msvc14: Added Rtl_Type suffix to IntDir and OutDir --- msvc/props/msvc140.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msvc/props/msvc140.props b/msvc/props/msvc140.props index e60a2ae..cbdb6ad 100644 --- a/msvc/props/msvc140.props +++ b/msvc/props/msvc140.props @@ -4,8 +4,8 @@ pugixml - vs.$(PlatformToolset)\$(Platform)_$(Configuration)\ - vs.$(PlatformToolset)\$(Platform)_$(Configuration)\ + vs.$(PlatformToolset)\$(Platform)_$(Configuration)_$(PUGI_Rtl_Type)\ + vs.$(PlatformToolset)\$(Platform)_$(Configuration)_$(PUGI_Rtl_Type)\ From 85f190d48f28ac7bc07bf995737ee458db8b18ec Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 14:12:08 +0300 Subject: [PATCH 39/44] msvc14: import pugixml.s.props to static project --- msvc/pugixml_vs2015_static.vcxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/msvc/pugixml_vs2015_static.vcxproj b/msvc/pugixml_vs2015_static.vcxproj index 6e7241f..17606e4 100644 --- a/msvc/pugixml_vs2015_static.vcxproj +++ b/msvc/pugixml_vs2015_static.vcxproj @@ -58,18 +58,22 @@ + + + + From 8df08bfd3e64c0944a448a18c16befbfbe6f3ab9 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 14:20:40 +0300 Subject: [PATCH 40/44] Msvc14: IntDir and OutDir changed a little --- msvc/props/msvc140.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msvc/props/msvc140.props b/msvc/props/msvc140.props index cbdb6ad..5f219d4 100644 --- a/msvc/props/msvc140.props +++ b/msvc/props/msvc140.props @@ -4,8 +4,8 @@ pugixml - vs.$(PlatformToolset)\$(Platform)_$(Configuration)_$(PUGI_Rtl_Type)\ - vs.$(PlatformToolset)\$(Platform)_$(Configuration)_$(PUGI_Rtl_Type)\ + vc.$(PlatformToolset)\$(Platform)_$(Configuration)_$(PUGI_Rtl_Type)\ + vc.$(PlatformToolset)\$(Platform)_$(Configuration)_$(PUGI_Rtl_Type)\ From ab1a1ef1d34bbdce41a7fe1a714a24b032f890bf Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 15:20:22 +0300 Subject: [PATCH 41/44] Updated Msvc10 solution --- msvc/pugixml_vs2010.sln | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/msvc/pugixml_vs2010.sln b/msvc/pugixml_vs2010.sln index 69c4477..3981428 100644 --- a/msvc/pugixml_vs2010.sln +++ b/msvc/pugixml_vs2010.sln @@ -8,17 +8,27 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|Win32.ActiveCfg = Debug|Win32 {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|Win32.Build.0 = Debug|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|x64.ActiveCfg = Debug|x64 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|x64.Build.0 = Debug|x64 {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|Win32.ActiveCfg = Release|Win32 {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|Win32.Build.0 = Release|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|x64.ActiveCfg = Release|x64 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|x64.Build.0 = Release|x64 {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|Win32.ActiveCfg = Debug|Win32 {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|Win32.Build.0 = Debug|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|x64.ActiveCfg = Debug|x64 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|x64.Build.0 = Debug|x64 {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|Win32.ActiveCfg = Release|Win32 {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|Win32.Build.0 = Release|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|x64.ActiveCfg = Release|x64 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 64fb7bb15ae598cd22cd74b5bdfcf1c1a602e5bf Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 15:49:37 +0300 Subject: [PATCH 42/44] Added msvc11 solution and projects: converted from Msvc10 --- msvc/pugixml_vs2012.sln | 36 ++++++++++++ msvc/pugixml_vs2012.vcxproj | 90 ++++++++++++++++++++++++++++ msvc/pugixml_vs2012_static.vcxproj | 94 ++++++++++++++++++++++++++++++ 3 files changed, 220 insertions(+) create mode 100644 msvc/pugixml_vs2012.sln create mode 100644 msvc/pugixml_vs2012.vcxproj create mode 100644 msvc/pugixml_vs2012_static.vcxproj diff --git a/msvc/pugixml_vs2012.sln b/msvc/pugixml_vs2012.sln new file mode 100644 index 0000000..f885d7e --- /dev/null +++ b/msvc/pugixml_vs2012.sln @@ -0,0 +1,36 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2012", "pugixml_vs2012.vcxproj", "{89A1E353-E2DC-495C-B403-742BE206ACED}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2012_static", "pugixml_vs2012_static.vcxproj", "{068BB22F-F8D8-417F-AA4A-41795D4594C6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|Win32.ActiveCfg = Debug|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|Win32.Build.0 = Debug|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|x64.ActiveCfg = Debug|x64 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|x64.Build.0 = Debug|x64 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|Win32.ActiveCfg = Release|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|Win32.Build.0 = Release|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|x64.ActiveCfg = Release|x64 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|x64.Build.0 = Release|x64 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|Win32.ActiveCfg = Debug|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|Win32.Build.0 = Debug|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|x64.ActiveCfg = Debug|x64 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|x64.Build.0 = Debug|x64 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|Win32.ActiveCfg = Release|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|Win32.Build.0 = Release|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|x64.ActiveCfg = Release|x64 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/msvc/pugixml_vs2012.vcxproj b/msvc/pugixml_vs2012.vcxproj new file mode 100644 index 0000000..d7ea77b --- /dev/null +++ b/msvc/pugixml_vs2012.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {89A1E353-E2DC-495C-B403-742BE206ACED} + pugixml + Win32Proj + + + + StaticLibrary + MultiByte + true + v110 + + + StaticLibrary + MultiByte + true + v110 + + + StaticLibrary + MultiByte + true + false + v110 + + + StaticLibrary + MultiByte + true + false + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/msvc/pugixml_vs2012_static.vcxproj b/msvc/pugixml_vs2012_static.vcxproj new file mode 100644 index 0000000..63ecea7 --- /dev/null +++ b/msvc/pugixml_vs2012_static.vcxproj @@ -0,0 +1,94 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {068BB22F-F8D8-417F-AA4A-41795D4594C6} + pugixml + Win32Proj + + + + StaticLibrary + MultiByte + true + v110 + + + StaticLibrary + MultiByte + true + v110 + + + StaticLibrary + MultiByte + true + false + v110 + + + StaticLibrary + MultiByte + true + false + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + + + + + + + + + + + + + \ No newline at end of file From 588118feb7f280128a640b19510da46fbe728f8d Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 15:49:59 +0300 Subject: [PATCH 43/44] Added msvc12 solution and projects: converted from Msvc10 --- msvc/pugixml_vs2013.sln | 38 ++++++++++++ msvc/pugixml_vs2013.vcxproj | 90 ++++++++++++++++++++++++++++ msvc/pugixml_vs2013_static.vcxproj | 94 ++++++++++++++++++++++++++++++ 3 files changed, 222 insertions(+) create mode 100644 msvc/pugixml_vs2013.sln create mode 100644 msvc/pugixml_vs2013.vcxproj create mode 100644 msvc/pugixml_vs2013_static.vcxproj diff --git a/msvc/pugixml_vs2013.sln b/msvc/pugixml_vs2013.sln new file mode 100644 index 0000000..3c9e73e --- /dev/null +++ b/msvc/pugixml_vs2013.sln @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2013", "pugixml_vs2013.vcxproj", "{89A1E353-E2DC-495C-B403-742BE206ACED}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2013_static", "pugixml_vs2013_static.vcxproj", "{068BB22F-F8D8-417F-AA4A-41795D4594C6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|Win32.ActiveCfg = Debug|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|Win32.Build.0 = Debug|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|x64.ActiveCfg = Debug|x64 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Debug|x64.Build.0 = Debug|x64 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|Win32.ActiveCfg = Release|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|Win32.Build.0 = Release|Win32 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|x64.ActiveCfg = Release|x64 + {89A1E353-E2DC-495C-B403-742BE206ACED}.Release|x64.Build.0 = Release|x64 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|Win32.ActiveCfg = Debug|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|Win32.Build.0 = Debug|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|x64.ActiveCfg = Debug|x64 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Debug|x64.Build.0 = Debug|x64 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|Win32.ActiveCfg = Release|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|Win32.Build.0 = Release|Win32 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|x64.ActiveCfg = Release|x64 + {068BB22F-F8D8-417F-AA4A-41795D4594C6}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/msvc/pugixml_vs2013.vcxproj b/msvc/pugixml_vs2013.vcxproj new file mode 100644 index 0000000..ba2b2dd --- /dev/null +++ b/msvc/pugixml_vs2013.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {89A1E353-E2DC-495C-B403-742BE206ACED} + pugixml + Win32Proj + + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + false + v120 + + + StaticLibrary + MultiByte + true + false + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/msvc/pugixml_vs2013_static.vcxproj b/msvc/pugixml_vs2013_static.vcxproj new file mode 100644 index 0000000..6721ef7 --- /dev/null +++ b/msvc/pugixml_vs2013_static.vcxproj @@ -0,0 +1,94 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {068BB22F-F8D8-417F-AA4A-41795D4594C6} + pugixml + Win32Proj + + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + false + v120 + + + StaticLibrary + MultiByte + true + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + + + + + + + + + + + + + \ No newline at end of file From d2bae889ebba2ccd9e1f4bddc8071803b485fa79 Mon Sep 17 00:00:00 2001 From: SeVlaT Date: Fri, 13 Nov 2015 17:18:44 +0300 Subject: [PATCH 44/44] Added readme.txt --- msvc/readme.txt | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 msvc/readme.txt diff --git a/msvc/readme.txt b/msvc/readme.txt new file mode 100644 index 0000000..acb1248 --- /dev/null +++ b/msvc/readme.txt @@ -0,0 +1,29 @@ +A new approach to MSVC build system, using PropertySheets. +This approach is based on MsBuild ver 4, so it concerns only latest MSVS versions (starting from Msvs2010). +New projects, solutions and props files are located in msvc directory. + +All properties and item metadata, such as compiler and linker settings are declared in PropertySheets (*.props files). + +There are dozen props *.files in msvc/props directory. Each *.props file contain settings for some build configuration. The most part of *.props files are suitable for all VisualStudio versions. + +Each project file should import pugixml.props file (located in msvc directory). Projects for static RTL should also import pugixml.s.props (before pugixml.props). + +Advantages of this approach: + * Each parameter stores in only one plase. So it is easier to explore the structure of projects. It's easier to change some setting. + * Project files became smaller and easier to read. + * It's easier to create new vcxproj files based on existing project. For example, projects for Msvc11 and Msvc12 was created using Msvc10 project. + +Visual studio has a nice instrument for exploring and editing property sheets: Property Manager. If it not visible, turn it on by using menu View/OtherWindows/PropertyManager. + +And yet another new feachure. User can customize building process by inserting his own property sheet into project structure (without modifying any file from pugixml directory). + +For example: + MsBuild.exe /p:PUGI_Props_External=d:\MyProps.props pugixml_vs2010.vcxproj + +Best regards, +Taymanov Sergey, +Moscow. + + + +