diff --git a/SCons/config.py b/SCons/config.py index 847e34cb..42c60e6d 100644 --- a/SCons/config.py +++ b/SCons/config.py @@ -28,14 +28,6 @@ cfg.Add( ) ) -cfg.Add( - ( - 'NSIS_VARS_SECTION', - 'defines the name of the PE section containing the runtime variables', - '.ndata' - ) -) - cfg.Add( BoolOption( 'NSIS_CONFIG_UNINSTALL_SUPPORT', @@ -434,7 +426,6 @@ def AddBoolDefine(define): AddValuedDefine('NSIS_MAX_STRLEN') AddValuedDefine('NSIS_MAX_INST_TYPES') AddValuedDefine('NSIS_DEFAULT_LANG') -AddValuedDefine('NSIS_VARS_SECTION') AddBoolDefine('NSIS_CONFIG_UNINSTALL_SUPPORT') AddBoolDefine('NSIS_CONFIG_LICENSEPAGE') diff --git a/Source/exehead/config.h b/Source/exehead/config.h index e0282f51..ca19974a 100644 --- a/Source/exehead/config.h +++ b/Source/exehead/config.h @@ -128,6 +128,11 @@ typedef char NSIS_STRING[NSIS_MAX_STRLEN]; +// I'd love to move this one to config.py, but it must have quotes for #pragma +// and at the same time can't have quotes because the shell will kill it... + +#define NSIS_VARS_SECTION ".ndata" + #endif//!APSTUDIO_INVOKED #endif // NSIS_CONFIG_H