From ab86960e481f2e9ddcb90561f3c0e52f19199164 Mon Sep 17 00:00:00 2001 From: "rip.nsk" Date: Fri, 24 Apr 2020 17:56:46 -0700 Subject: [PATCH] Add "Include pugixml.cpp" and "Header Only" linkage options --- .../build/native/pugixml-propertiesui.xml | 2 ++ scripts/nuget/build/native/pugixml.targets | 19 ++++++++++--------- scripts/nuget_build.ps1 | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/scripts/nuget/build/native/pugixml-propertiesui.xml b/scripts/nuget/build/native/pugixml-propertiesui.xml index 0732cc2..bfbd219 100644 --- a/scripts/nuget/build/native/pugixml-propertiesui.xml +++ b/scripts/nuget/build/native/pugixml-propertiesui.xml @@ -10,6 +10,8 @@ + + diff --git a/scripts/nuget/build/native/pugixml.targets b/scripts/nuget/build/native/pugixml.targets index 97d13b2..7a6e318 100644 --- a/scripts/nuget/build/native/pugixml.targets +++ b/scripts/nuget/build/native/pugixml.targets @@ -2,26 +2,27 @@ dynamic + Debug + Release - $(MSBuildThisFileDirectory)include/;%(AdditionalIncludeDirectories) + PUGIXML_HEADER_ONLY;%(PreprocessorDefinitions) + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories) - $(MSBuildThisFileDirectory)include/;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories) - + + + + - $(MSBuildThisFileDirectory)lib/$(Platform)\$(PlatformToolset.Split('_')[0])\$(Linkage-pugixml)\Debug\pugixml.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)lib/$(Platform)\$(PlatformToolset.Split('_')[0])\$(Linkage-pugixml)\Release\pugixml.lib;%(AdditionalDependencies) + $(MSBuildThisFileDirectory)lib/$(Platform)\$(PlatformToolset.Split('_')[0])\$(Linkage-pugixml)\$(Configuration-pugixml)\pugixml.lib;%(AdditionalDependencies) diff --git a/scripts/nuget_build.ps1 b/scripts/nuget_build.ps1 index cd18d29..7368f3b 100644 --- a/scripts/nuget_build.ps1 +++ b/scripts/nuget_build.ps1 @@ -33,6 +33,7 @@ cd $scriptdir Force-Copy "../src/pugiconfig.hpp" "nuget/build/native/include/pugiconfig.hpp" Force-Copy "../src/pugixml.hpp" "nuget/build/native/include/pugixml.hpp" +Force-Copy "../src/pugixml.cpp" "nuget/build/native/include/pugixml.cpp" if ($args[0] -eq 2019){ Build-Version "vs2019" "v142" "dynamic"