diff options
| author | Bob Arnson <bob@joyofsetup.com> | 2020-03-09 13:47:57 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-03-09 13:52:22 -0400 |
| commit | 1e63f31a2b8caf3a81f619d0786efddb0173ab05 (patch) | |
| tree | f44207ee186aa0ba13784ecc766c82de24404a90 /src/ca | |
| parent | 7db9d55d7723fd5c451ded7fbbfde0a4b220b8dd (diff) | |
| download | wix-1e63f31a2b8caf3a81f619d0786efddb0173ab05.tar.gz wix-1e63f31a2b8caf3a81f619d0786efddb0173ab05.tar.bz2 wix-1e63f31a2b8caf3a81f619d0786efddb0173ab05.zip | |
Version extension ids.
Partial fix for wixtoolset/issues#5933.
Diffstat (limited to 'src/ca')
| -rw-r--r-- | src/ca/caDecor.h | 13 | ||||
| -rw-r--r-- | src/ca/precomp.h | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/ca/caDecor.h b/src/ca/caDecor.h new file mode 100644 index 00000000..da274650 --- /dev/null +++ b/src/ca/caDecor.h | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | #pragma once | ||
| 2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
| 3 | |||
| 4 | |||
| 5 | #if defined(_M_ARM64) | ||
| 6 | #define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64" | ||
| 7 | #elif defined(_M_AMD64) | ||
| 8 | #define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64" | ||
| 9 | #elif defined(_M_ARM) | ||
| 10 | #define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM" | ||
| 11 | #else | ||
| 12 | #define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86" | ||
| 13 | #endif | ||
diff --git a/src/ca/precomp.h b/src/ca/precomp.h index 5caedb16..4a83c164 100644 --- a/src/ca/precomp.h +++ b/src/ca/precomp.h | |||
| @@ -10,4 +10,5 @@ | |||
| 10 | #include "strutil.h" | 10 | #include "strutil.h" |
| 11 | #include "pathutil.h" | 11 | #include "pathutil.h" |
| 12 | 12 | ||
| 13 | #include "caDecor.h" | ||
| 13 | #include "cost.h" | 14 | #include "cost.h" |