From 851e838f9ee1a0388d088eac266655df2fc6d95d Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 17 Sep 2017 15:21:10 -0700
Subject: Remove "lib" from path in NuGet package
---
src/dutil/build/WixToolset.DUtil.props | 4 ++--
src/dutil/dutil.nuspec | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/dutil/build/WixToolset.DUtil.props b/src/dutil/build/WixToolset.DUtil.props
index ec1ae2a4..e39d9cea 100644
--- a/src/dutil/build/WixToolset.DUtil.props
+++ b/src/dutil/build/WixToolset.DUtil.props
@@ -12,12 +12,12 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
<Link>
- <AdditionalDependencies>$(MSBuildThisFileDirectory)native\lib\v140\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
<Link>
- <AdditionalDependencies>$(MSBuildThisFileDirectory)native\lib\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project>
diff --git a/src/dutil/dutil.nuspec b/src/dutil/dutil.nuspec
index 337d43cc..fd40b1d9 100644
--- a/src/dutil/dutil.nuspec
+++ b/src/dutil/dutil.nuspec
@@ -15,9 +15,9 @@
<files>
<file src="build\$id$.props" target="build\" />
<file src="inc\*" target="build\native\include" />
- <file src="..\..\build\$configuration$\v140_xp\x64\dutil.lib" target="build\native\lib\v140\x64" />
- <file src="..\..\build\$configuration$\v140_xp\x86\dutil.lib" target="build\native\lib\v140\x86" />
- <file src="..\..\build\$configuration$\v141_xp\x64\dutil.lib" target="build\native\lib\v141\x64" />
- <file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\lib\v141\x86" />
+ <file src="..\..\build\$configuration$\v140_xp\x64\dutil.lib" target="build\native\v140\x64" />
+ <file src="..\..\build\$configuration$\v140_xp\x86\dutil.lib" target="build\native\v140\x86" />
+ <file src="..\..\build\$configuration$\v141_xp\x64\dutil.lib" target="build\native\v141\x64" />
+ <file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\v141\x86" />
</files>
</package>
--
cgit v1.2.3-55-g6feb