diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-09 21:08:49 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-09 21:11:56 +1000 |
| commit | 670075995cf1b78d0a66e1a7678fd2facc8958ff (patch) | |
| tree | df7f699b85e34bb8f487fdad64aaaa9cb8dbfe9f /src/wixnative | |
| parent | df6e15e2b026f8a419fb275c0b50c9d3b3298859 (diff) | |
| download | wix-670075995cf1b78d0a66e1a7678fd2facc8958ff.tar.gz wix-670075995cf1b78d0a66e1a7678fd2facc8958ff.tar.bz2 wix-670075995cf1b78d0a66e1a7678fd2facc8958ff.zip | |
Use NATIVE_DLL_SEARCH_DIRECTORIES to support cross-platform wixnative.exe
Diffstat (limited to 'src/wixnative')
| -rw-r--r-- | src/wixnative/runtime.win.WixToolset.Core.Native.nuspec | 8 | ||||
| -rw-r--r-- | src/wixnative/wixnative.vcxproj | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec b/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec index f7697694..59eff4e6 100644 --- a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec +++ b/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec | |||
| @@ -14,9 +14,9 @@ | |||
| 14 | </metadata> | 14 | </metadata> |
| 15 | 15 | ||
| 16 | <files> | 16 | <files> |
| 17 | <file src="Win32\wixnative.x86.exe" target="runtimes\win-x86\native" /> | 17 | <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" /> |
| 18 | <file src="Win32\wixnative.x86.pdb" target="runtimes\win-x86\native" /> | 18 | <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" /> |
| 19 | <file src="x64\wixnative.amd64.exe" target="runtimes\win-x64\native" /> | 19 | <file src="x64\wixnative.exe" target="runtimes\win-x64\native" /> |
| 20 | <file src="x64\wixnative.amd64.pdb" target="runtimes\win-x64\native" /> | 20 | <file src="x64\wixnative.pdb" target="runtimes\win-x64\native" /> |
| 21 | </files> | 21 | </files> |
| 22 | </package> | 22 | </package> |
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj index 1c1c9010..57afcc0b 100644 --- a/src/wixnative/wixnative.vcxproj +++ b/src/wixnative/wixnative.vcxproj | |||
| @@ -23,16 +23,11 @@ | |||
| 23 | </ProjectConfiguration> | 23 | </ProjectConfiguration> |
| 24 | </ItemGroup> | 24 | </ItemGroup> |
| 25 | 25 | ||
| 26 | <PropertyGroup> | ||
| 27 | <NameSuffix Condition=" '$(Platform)'=='Win32' ">x86</NameSuffix> | ||
| 28 | <NameSuffix Condition=" '$(Platform)'=='x64' ">amd64</NameSuffix> | ||
| 29 | </PropertyGroup> | ||
| 30 | |||
| 31 | <PropertyGroup Label="Globals"> | 26 | <PropertyGroup Label="Globals"> |
| 32 | <ProjectGuid>{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}</ProjectGuid> | 27 | <ProjectGuid>{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}</ProjectGuid> |
| 33 | <ConfigurationType>Application</ConfigurationType> | 28 | <ConfigurationType>Application</ConfigurationType> |
| 34 | <ProjectSubSystem>Console</ProjectSubSystem> | 29 | <ProjectSubSystem>Console</ProjectSubSystem> |
| 35 | <TargetName>wixnative.$(NameSuffix)</TargetName> | 30 | <TargetName>wixnative</TargetName> |
| 36 | <PlatformToolset>v141</PlatformToolset> | 31 | <PlatformToolset>v141</PlatformToolset> |
| 37 | <CharacterSet>Unicode</CharacterSet> | 32 | <CharacterSet>Unicode</CharacterSet> |
| 38 | <Description>Native component of WixToolset.Core</Description> | 33 | <Description>Native component of WixToolset.Core</Description> |