diff options
Diffstat (limited to 'src/windows/installer')
| -rw-r--r-- | src/windows/installer/wix/config.wxi | 8 | ||||
| -rw-r--r-- | src/windows/installer/wix/site-local.wxi | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi index 3bb1cc95cd..806fe36f21 100644 --- a/src/windows/installer/wix/config.wxi +++ b/src/windows/installer/wix/config.wxi @@ -64,6 +64,14 @@ <?include lang\config_$(var.BuildLang).wxi?> <!-- Parameters for the features containing debug symbols --> + <?ifdef env.NODEBUG?> + <?ifdef env.DEBUG_SYMBOL?> + <?define DebugSyms?> + <?endif?> + <?else?> + <?define Debug?> + <?define DebugSyms?> + <?endif?> <?ifdef DebugSyms?> <?ifdef Debug?> <?define DebugSymInstallDefault="followParent"?> diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi index 80defd94a0..c3ebc02b07 100644 --- a/src/windows/installer/wix/site-local.wxi +++ b/src/windows/installer/wix/site-local.wxi @@ -52,13 +52,8 @@ <!-- At most one of the following could be defined and must correspond to the type of build performed. --> - <?define Debug?> <!--<?define Release?>--> - <!-- We are including debug symbols anyway. Undefine this for a leaner - installer without debug syms. --> - <?define DebugSyms?> - <!-- Optional defines --> <!-- <?define Beta="1"?> --> <!-- Numeric Beta identifier --> <!-- <?define OldHelp?> --> <!-- Specifies the use of the old leash32.hlp file |