diff options
| author | Rob Mensching <rob@firegiant.com> | 2023-02-14 23:11:29 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2023-02-21 23:31:32 -0700 |
| commit | 3cb9bbe90e329a3550bb55fda5c620f23fc4eb86 (patch) | |
| tree | 78064d1008a6f8c6682e8adc9b4f85d18e4bfed2 /src/ext/Util/wixlib | |
| parent | 69f11ee0275692528ed034a3885fa9f0c1504704 (diff) | |
| download | wix-3cb9bbe90e329a3550bb55fda5c620f23fc4eb86.tar.gz wix-3cb9bbe90e329a3550bb55fda5c620f23fc4eb86.tar.bz2 wix-3cb9bbe90e329a3550bb55fda5c620f23fc4eb86.zip | |
Update some extensions to take advantage of multitargeting project references
Diffstat (limited to 'src/ext/Util/wixlib')
| -rw-r--r-- | src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi | 2 | ||||
| -rw-r--r-- | src/ext/Util/wixlib/UtilExtension_Platform.wxi | 2 | ||||
| -rw-r--r-- | src/ext/Util/wixlib/util.wixproj | 14 |
3 files changed, 4 insertions, 14 deletions
diff --git a/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi b/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi index a2e295f2..5c964d7d 100644 --- a/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi +++ b/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi | |||
| @@ -5,6 +5,6 @@ | |||
| 5 | <?include ..\..\caDecor.wxi ?> | 5 | <?include ..\..\caDecor.wxi ?> |
| 6 | 6 | ||
| 7 | <Fragment> | 7 | <Fragment> |
| 8 | <BundleExtension Id="$(var.Prefix)UtilBundleExtension$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilbe.dll" Name="$(var.Prefix)UtilBundleExtension$(var.Suffix)\utilbe.dll" /> | 8 | <BundleExtension Id="$(var.Prefix)UtilBundleExtension$(var.Suffix)" SourceFile="!(bindpath.utilbe.$(var.platform))utilbe.dll" Name="$(var.Prefix)UtilBundleExtension$(var.Suffix)\utilbe.dll" /> |
| 9 | </Fragment> | 9 | </Fragment> |
| 10 | </Include> | 10 | </Include> |
diff --git a/src/ext/Util/wixlib/UtilExtension_Platform.wxi b/src/ext/Util/wixlib/UtilExtension_Platform.wxi index c748fff7..be48c495 100644 --- a/src/ext/Util/wixlib/UtilExtension_Platform.wxi +++ b/src/ext/Util/wixlib/UtilExtension_Platform.wxi | |||
| @@ -367,6 +367,6 @@ | |||
| 367 | </Fragment> | 367 | </Fragment> |
| 368 | 368 | ||
| 369 | <Fragment> | 369 | <Fragment> |
| 370 | <Binary Id="$(var.Prefix)UtilCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilca.dll" /> | 370 | <Binary Id="$(var.Prefix)UtilCA$(var.Suffix)" SourceFile="!(bindpath.utilca.$(var.platform))utilca.dll" /> |
| 371 | </Fragment> | 371 | </Fragment> |
| 372 | </Include> | 372 | </Include> |
diff --git a/src/ext/Util/wixlib/util.wixproj b/src/ext/Util/wixlib/util.wixproj index c1975af2..7631e149 100644 --- a/src/ext/Util/wixlib/util.wixproj +++ b/src/ext/Util/wixlib/util.wixproj | |||
| @@ -6,18 +6,8 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | 7 | ||
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <BindInputPaths Include="$(OutputPath)x86" BindName='x86' /> | 9 | <ProjectReference Include="..\be\utilbe.vcxproj" Platforms="arm64,x86,x64" /> |
| 10 | <BindInputPaths Include="$(OutputPath)x64" BindName='x64' /> | 10 | <ProjectReference Include="..\ca\utilca.vcxproj" Platforms="arm64,x86,x64" /> |
| 11 | <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' /> | ||
| 12 | </ItemGroup> | ||
| 13 | |||
| 14 | <ItemGroup> | ||
| 15 | <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=ARM64" /> | ||
| 16 | <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x86" /> | ||
| 17 | <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x64" /> | ||
| 18 | <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM64" /> | ||
| 19 | <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x86" /> | ||
| 20 | <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x64" /> | ||
| 21 | </ItemGroup> | 11 | </ItemGroup> |
| 22 | 12 | ||
| 23 | <ItemGroup> | 13 | <ItemGroup> |