diff options
| -rw-r--r-- | scripts/nuget_build.ps1 | 80 | ||||
| -rw-r--r-- | scripts/pugixml_vs2010.vcxproj | 28 | ||||
| -rw-r--r-- | scripts/pugixml_vs2010_static.vcxproj | 40 | ||||
| -rw-r--r-- | scripts/pugixml_vs2013.vcxproj | 30 | ||||
| -rw-r--r-- | scripts/pugixml_vs2013_static.vcxproj | 42 | 
5 files changed, 92 insertions, 128 deletions
| diff --git a/scripts/nuget_build.ps1 b/scripts/nuget_build.ps1 index 20f2d89..9028426 100644 --- a/scripts/nuget_build.ps1 +++ b/scripts/nuget_build.ps1 @@ -6,78 +6,42 @@ function Run-Command([string]$cmd)  function Force-Copy([string]$from, [string]$to)  { -	Write-Host $from "=>" $to +	Write-Host $from "->" $to  	New-Item -Force $to | Out-Null  	Copy-Item -Force $from $to  	if (! $?) { exit 1 }  } -Push-Location -$scriptdir = Split-Path $MyInvocation.MyCommand.Path -cd $scriptdir - -Run-Command "msbuild pugixml_vs2013.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2013.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2013.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2013.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" - -Run-Command "msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" - -Run-Command "msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" +function Build-Version([string]$vs, [string]$toolset, [string]$linkage) +{ +	$prjsuffix = if ($linkage -eq "static") { "_static" } else { "" } +	$cfgsuffix = if ($linkage -eq "static") { "Static" } else { "" } -Run-Command "msbuild pugixml_vs2015_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2015_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2015_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2015_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" +	foreach ($configuration in "Debug","Release") +	{ +		Run-Command "msbuild pugixml_$vs$prjsuffix.vcxproj /t:Rebuild /p:Configuration=$configuration /p:Platform=x86 /v:minimal /nologo" +		Run-Command "msbuild pugixml_$vs$prjsuffix.vcxproj /t:Rebuild /p:Configuration=$configuration /p:Platform=x64 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" +		Force-Copy "$vs/Win32_$configuration$cfgsuffix/pugixml.lib" "nuget/build/native/lib/Win32/$toolset/$linkage/$configuration/pugixml.lib" +		Force-Copy "$vs/x64_$configuration$cfgsuffix/pugixml.lib" "nuget/build/native/lib/x64/$toolset/$linkage/$configuration/pugixml.lib" +	} +} -Run-Command "msbuild pugixml_vs2017_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2017_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2017_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" -Run-Command "msbuild pugixml_vs2017_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" +Push-Location +$scriptdir = Split-Path $MyInvocation.MyCommand.Path +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 "vs2013/x32/pugixml.lib" "nuget/build/native/lib/Win32/v120/dynamic/Release/pugixml.lib" -Force-Copy "vs2013/x32/pugixmld.lib" "nuget/build/native/lib/Win32/v120/dynamic/Debug/pugixml.lib" -Force-Copy "vs2013/x64/pugixml.lib" "nuget/build/native/lib/x64/v120/dynamic/Release/pugixml.lib" -Force-Copy "vs2013/x64/pugixmld.lib" "nuget/build/native/lib/x64/v120/dynamic/Debug/pugixml.lib" - -Force-Copy "vs2013/x32/pugixmls.lib" "nuget/build/native/lib/Win32/v120/static/Release/pugixml.lib" -Force-Copy "vs2013/x32/pugixmlsd.lib" "nuget/build/native/lib/Win32/v120/static/Debug/pugixml.lib" -Force-Copy "vs2013/x64/pugixmls.lib" "nuget/build/native/lib/x64/v120/static/Release/pugixml.lib" -Force-Copy "vs2013/x64/pugixmlsd.lib" "nuget/build/native/lib/x64/v120/static/Debug/pugixml.lib" - -Force-Copy "vs2015/Win32_Release/pugixml.lib" "nuget/build/native/lib/Win32/v140/dynamic/Release/pugixml.lib" -Force-Copy "vs2015/Win32_Debug/pugixml.lib" "nuget/build/native/lib/Win32/v140/dynamic/Debug/pugixml.lib" -Force-Copy "vs2015/x64_Release/pugixml.lib" "nuget/build/native/lib/x64/v140/dynamic/Release/pugixml.lib" -Force-Copy "vs2015/x64_Debug/pugixml.lib" "nuget/build/native/lib/x64/v140/dynamic/Debug/pugixml.lib" - -Force-Copy "vs2015/Win32_ReleaseStatic/pugixml.lib" "nuget/build/native/lib/Win32/v140/static/Release/pugixml.lib" -Force-Copy "vs2015/Win32_DebugStatic/pugixml.lib" "nuget/build/native/lib/Win32/v140/static/Debug/pugixml.lib" -Force-Copy "vs2015/x64_ReleaseStatic/pugixml.lib" "nuget/build/native/lib/x64/v140/static/Release/pugixml.lib" -Force-Copy "vs2015/x64_DebugStatic/pugixml.lib" "nuget/build/native/lib/x64/v140/static/Debug/pugixml.lib" +Build-Version "vs2013" "v120" "dynamic" +Build-Version "vs2013" "v120" "static" -Force-Copy "vs2017/Win32_Release/pugixml.lib" "nuget/build/native/lib/Win32/v141/dynamic/Release/pugixml.lib" -Force-Copy "vs2017/Win32_Debug/pugixml.lib" "nuget/build/native/lib/Win32/v141/dynamic/Debug/pugixml.lib" -Force-Copy "vs2017/x64_Release/pugixml.lib" "nuget/build/native/lib/x64/v141/dynamic/Release/pugixml.lib" -Force-Copy "vs2017/x64_Debug/pugixml.lib" "nuget/build/native/lib/x64/v141/dynamic/Debug/pugixml.lib" +Build-Version "vs2015" "v140" "dynamic" +Build-Version "vs2015" "v140" "static" -Force-Copy "vs2017/Win32_ReleaseStatic/pugixml.lib" "nuget/build/native/lib/Win32/v141/static/Release/pugixml.lib" -Force-Copy "vs2017/Win32_DebugStatic/pugixml.lib" "nuget/build/native/lib/Win32/v141/static/Debug/pugixml.lib" -Force-Copy "vs2017/x64_ReleaseStatic/pugixml.lib" "nuget/build/native/lib/x64/v141/static/Release/pugixml.lib" -Force-Copy "vs2017/x64_DebugStatic/pugixml.lib" "nuget/build/native/lib/x64/v141/static/Debug/pugixml.lib" +Build-Version "vs2015" "v141" "dynamic" +Build-Version "vs2015" "v141" "static"  Run-Command "nuget pack nuget" diff --git a/scripts/pugixml_vs2010.vcxproj b/scripts/pugixml_vs2010.vcxproj index c29b4c5..d29c463 100644 --- a/scripts/pugixml_vs2010.vcxproj +++ b/scripts/pugixml_vs2010.vcxproj @@ -64,17 +64,17 @@  	<PropertyGroup Label="UserMacros" />  	<PropertyGroup>  		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> -		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\x32\</OutDir> -		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\x32\Debug\</IntDir> -		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixmld</TargetName> -		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64\</OutDir> -		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64\Debug\</IntDir> -		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixmld</TargetName> -		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\x32\</OutDir> -		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\x32\Release\</IntDir> +		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\Win32_Debug\</OutDir> +		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\Win32_Debug\</IntDir> +		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixml</TargetName> +		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64_Debug\</OutDir> +		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64_Debug\</IntDir> +		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixml</TargetName> +		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\Win32_Release\</OutDir> +		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\Win32_Release\</IntDir>  		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixml</TargetName> -		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64\</OutDir> -		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64\Release\</IntDir> +		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64_Release\</OutDir> +		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64_Release\</IntDir>  		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixml</TargetName>  	</PropertyGroup>  	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -93,12 +93,12 @@  			<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>  		</ResourceCompile>  	<Lib> -		<OutputFile>$(OutDir)pugixmld.lib</OutputFile> +		<OutputFile>$(OutDir)pugixml.lib</OutputFile>  	</Lib>  		<Link>  			<SubSystem>Windows</SubSystem>  			<GenerateDebugInformation>true</GenerateDebugInformation> -			<ProgramDataBaseFileName>$(OutDir)pugixmld.pdb</ProgramDataBaseFileName> +			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>  		</Link>  	</ItemDefinitionGroup>  	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -117,12 +117,12 @@  			<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>  		</ResourceCompile>  	<Lib> -		<OutputFile>$(OutDir)pugixmld.lib</OutputFile> +		<OutputFile>$(OutDir)pugixml.lib</OutputFile>  	</Lib>  		<Link>  			<SubSystem>Windows</SubSystem>  			<GenerateDebugInformation>true</GenerateDebugInformation> -			<ProgramDataBaseFileName>$(OutDir)pugixmld.pdb</ProgramDataBaseFileName> +			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>  		</Link>  	</ItemDefinitionGroup>  	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> diff --git a/scripts/pugixml_vs2010_static.vcxproj b/scripts/pugixml_vs2010_static.vcxproj index c1e133c..e770d17 100644 --- a/scripts/pugixml_vs2010_static.vcxproj +++ b/scripts/pugixml_vs2010_static.vcxproj @@ -64,18 +64,18 @@  	<PropertyGroup Label="UserMacros" />  	<PropertyGroup>  		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> -		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\x32\</OutDir> -		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\x32\DebugStatic\</IntDir> -		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixmlsd</TargetName> -		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64\</OutDir> -		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64\DebugStatic\</IntDir> -		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixmlsd</TargetName> -		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\x32\</OutDir> -		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\x32\ReleaseStatic\</IntDir> -		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixmls</TargetName> -		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64\</OutDir> -		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64\ReleaseStatic\</IntDir> -		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixmls</TargetName> +		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\Win32_DebugStatic\</OutDir> +		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\Win32_DebugStatic\</IntDir> +		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixml</TargetName> +		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64_DebugStatic\</OutDir> +		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64_DebugStatic\</IntDir> +		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixml</TargetName> +		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\Win32_ReleaseStatic\</OutDir> +		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\Win32_ReleaseStatic\</IntDir> +		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixml</TargetName> +		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64_ReleaseStatic\</OutDir> +		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64_ReleaseStatic\</IntDir> +		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixml</TargetName>  	</PropertyGroup>  	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">  		<ClCompile> @@ -93,12 +93,12 @@  			<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>  		</ResourceCompile>  	<Lib> -		<OutputFile>$(OutDir)pugixmlsd.lib</OutputFile> +		<OutputFile>$(OutDir)pugixml.lib</OutputFile>  	</Lib>  		<Link>  			<SubSystem>Windows</SubSystem>  			<GenerateDebugInformation>true</GenerateDebugInformation> -			<ProgramDataBaseFileName>$(OutDir)pugixmlsd.pdb</ProgramDataBaseFileName> +			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>  		</Link>  	</ItemDefinitionGroup>  	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -117,12 +117,12 @@  			<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>  		</ResourceCompile>  	<Lib> -		<OutputFile>$(OutDir)pugixmlsd.lib</OutputFile> +		<OutputFile>$(OutDir)pugixml.lib</OutputFile>  	</Lib>  		<Link>  			<SubSystem>Windows</SubSystem>  			<GenerateDebugInformation>true</GenerateDebugInformation> -			<ProgramDataBaseFileName>$(OutDir)pugixmlsd.pdb</ProgramDataBaseFileName> +			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>  		</Link>  	</ItemDefinitionGroup>  	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -141,14 +141,14 @@  			<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>  		</ResourceCompile>  	<Lib> -		<OutputFile>$(OutDir)pugixmls.lib</OutputFile> +		<OutputFile>$(OutDir)pugixml.lib</OutputFile>  	</Lib>  		<Link>  			<SubSystem>Windows</SubSystem>  			<GenerateDebugInformation>true</GenerateDebugInformation>  			<OptimizeReferences>true</OptimizeReferences>  			<EnableCOMDATFolding>true</EnableCOMDATFolding> -			<ProgramDataBaseFileName>$(OutDir)pugixmls.pdb</ProgramDataBaseFileName> +			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>  		</Link>  	</ItemDefinitionGroup>  	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -167,14 +167,14 @@  			<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>  		</ResourceCompile>  	<Lib> -		<OutputFile>$(OutDir)pugixmls.lib</OutputFile> +		<OutputFile>$(OutDir)pugixml.lib</OutputFile>  	</Lib>  		<Link>  			<SubSystem>Windows</SubSystem>  			<GenerateDebugInformation>true</GenerateDebugInformation>  			<OptimizeReferences>true</OptimizeReferences>  			<EnableCOMDATFolding>true</EnableCOMDATFolding> -			<ProgramDataBaseFileName>$(OutDir)pugixmls.pdb</ProgramDataBaseFileName> +			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>  		</Link>  	</ItemDefinitionGroup>  	<ItemGroup> diff --git a/scripts/pugixml_vs2013.vcxproj b/scripts/pugixml_vs2013.vcxproj index c719394..eae27c9 100644 --- a/scripts/pugixml_vs2013.vcxproj +++ b/scripts/pugixml_vs2013.vcxproj @@ -68,17 +68,17 @@    <PropertyGroup Label="UserMacros" />    <PropertyGroup>      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\x32\</OutDir> -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\x32\Debug\</IntDir> -    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixmld</TargetName> -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64\</OutDir> -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64\Debug\</IntDir> -    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixmld</TargetName> -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\x32\</OutDir> -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\x32\Release\</IntDir> +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\Win32_Debug\</OutDir> +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\Win32_Debug\</IntDir> +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixml</TargetName> +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64_Debug\</OutDir> +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64_Debug\</IntDir> +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixml</TargetName> +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\Win32_Release\</OutDir> +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\Win32_Release\</IntDir>      <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixml</TargetName> -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64\</OutDir> -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64\Release\</IntDir> +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64_Release\</OutDir> +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64_Release\</IntDir>      <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixml</TargetName>    </PropertyGroup>    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -98,12 +98,12 @@        <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>      </ResourceCompile>      <Lib> -      <OutputFile>$(OutDir)pugixmld.lib</OutputFile> +      <OutputFile>$(OutDir)pugixml.lib</OutputFile>      </Lib>      <Link>        <SubSystem>Windows</SubSystem>        <GenerateDebugInformation>true</GenerateDebugInformation> -      <ProgramDataBaseFileName>$(OutDir)pugixmld.pdb</ProgramDataBaseFileName> +      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>      </Link>    </ItemDefinitionGroup>    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -123,12 +123,12 @@        <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>      </ResourceCompile>      <Lib> -      <OutputFile>$(OutDir)pugixmld.lib</OutputFile> +      <OutputFile>$(OutDir)pugixml.lib</OutputFile>      </Lib>      <Link>        <SubSystem>Windows</SubSystem>        <GenerateDebugInformation>true</GenerateDebugInformation> -      <ProgramDataBaseFileName>$(OutDir)pugixmld.pdb</ProgramDataBaseFileName> +      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>      </Link>    </ItemDefinitionGroup>    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -196,4 +196,4 @@    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />    <ImportGroup Label="ExtensionTargets">    </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/scripts/pugixml_vs2013_static.vcxproj b/scripts/pugixml_vs2013_static.vcxproj index acca608..0ad4fe2 100644 --- a/scripts/pugixml_vs2013_static.vcxproj +++ b/scripts/pugixml_vs2013_static.vcxproj @@ -68,18 +68,18 @@    <PropertyGroup Label="UserMacros" />    <PropertyGroup>      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\x32\</OutDir> -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\x32\DebugStatic\</IntDir> -    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixmlsd</TargetName> -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64\</OutDir> -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64\DebugStatic\</IntDir> -    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixmlsd</TargetName> -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\x32\</OutDir> -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\x32\ReleaseStatic\</IntDir> -    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixmls</TargetName> -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64\</OutDir> -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64\ReleaseStatic\</IntDir> -    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixmls</TargetName> +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\Win32_DebugStatic\</OutDir> +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\Win32_DebugStatic\</IntDir> +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixml</TargetName> +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64_DebugStatic\</OutDir> +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64_DebugStatic\</IntDir> +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixml</TargetName> +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\Win32_ReleaseStatic\</OutDir> +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\Win32_ReleaseStatic\</IntDir> +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixml</TargetName> +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64_ReleaseStatic\</OutDir> +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64_ReleaseStatic\</IntDir> +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixml</TargetName>    </PropertyGroup>    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">      <ClCompile> @@ -98,12 +98,12 @@        <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>      </ResourceCompile>      <Lib> -      <OutputFile>$(OutDir)pugixmlsd.lib</OutputFile> +      <OutputFile>$(OutDir)pugixml.lib</OutputFile>      </Lib>      <Link>        <SubSystem>Windows</SubSystem>        <GenerateDebugInformation>true</GenerateDebugInformation> -      <ProgramDataBaseFileName>$(OutDir)pugixmlsd.pdb</ProgramDataBaseFileName> +      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>      </Link>    </ItemDefinitionGroup>    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -123,12 +123,12 @@        <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>      </ResourceCompile>      <Lib> -      <OutputFile>$(OutDir)pugixmlsd.lib</OutputFile> +      <OutputFile>$(OutDir)pugixml.lib</OutputFile>      </Lib>      <Link>        <SubSystem>Windows</SubSystem>        <GenerateDebugInformation>true</GenerateDebugInformation> -      <ProgramDataBaseFileName>$(OutDir)pugixmlsd.pdb</ProgramDataBaseFileName> +      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>      </Link>    </ItemDefinitionGroup>    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -148,14 +148,14 @@        <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>      </ResourceCompile>      <Lib> -      <OutputFile>$(OutDir)pugixmls.lib</OutputFile> +      <OutputFile>$(OutDir)pugixml.lib</OutputFile>      </Lib>      <Link>        <SubSystem>Windows</SubSystem>        <GenerateDebugInformation>true</GenerateDebugInformation>        <OptimizeReferences>true</OptimizeReferences>        <EnableCOMDATFolding>true</EnableCOMDATFolding> -      <ProgramDataBaseFileName>$(OutDir)pugixmls.pdb</ProgramDataBaseFileName> +      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>      </Link>    </ItemDefinitionGroup>    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -175,14 +175,14 @@        <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>      </ResourceCompile>      <Lib> -      <OutputFile>$(OutDir)pugixmls.lib</OutputFile> +      <OutputFile>$(OutDir)pugixml.lib</OutputFile>      </Lib>      <Link>        <SubSystem>Windows</SubSystem>        <GenerateDebugInformation>true</GenerateDebugInformation>        <OptimizeReferences>true</OptimizeReferences>        <EnableCOMDATFolding>true</EnableCOMDATFolding> -      <ProgramDataBaseFileName>$(OutDir)pugixmls.pdb</ProgramDataBaseFileName> +      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>      </Link>    </ItemDefinitionGroup>    <ItemGroup> @@ -196,4 +196,4 @@    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />    <ImportGroup Label="ExtensionTargets">    </ImportGroup> -</Project>
\ No newline at end of file +</Project> | 
