From 32a717faf5944f3c7f75e507e09e79fcad715818 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 24 Feb 2006 19:12:04 +0000
Subject: [PATCH] move NSIS_VARS_SECTION to sconf.h

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4536 212acab6-be3b-0410-9dea-997c60f758d6
---
 SCons/config.py         | 13 +++++++++++++
 Source/exehead/config.h |  5 -----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/SCons/config.py b/SCons/config.py
index 24cd2a26..511021a9 100644
--- a/SCons/config.py
+++ b/SCons/config.py
@@ -28,6 +28,14 @@ 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',
@@ -431,6 +439,9 @@ def AddBoolDefine(define):
   if env[define]:
     defenv.Append(NSIS_CPPDEFINES = [define])
 
+def AddStringDefine(define):
+  defenv.Append(NSIS_CPPDEFINES = [(define, '"%s"' % env[define])])
+
 AddValuedDefine('NSIS_MAX_STRLEN')
 AddValuedDefine('NSIS_MAX_INST_TYPES')
 AddValuedDefine('NSIS_DEFAULT_LANG')
@@ -485,3 +496,5 @@ AddBoolDefine('NSIS_LOCKWINDOW_SUPPORT')
 AddBoolDefine('NSIS_CONFIG_PLUGIN_SUPPORT')
 AddBoolDefine('NSIS_FIX_COMMENT_HANDLING')
 AddBoolDefine('NSIS_CONFIG_CONST_DATA_PATH')
+
+AddStringDefine('NSIS_VARS_SECTION')
diff --git a/Source/exehead/config.h b/Source/exehead/config.h
index c7067d01..b150e8b8 100644
--- a/Source/exehead/config.h
+++ b/Source/exehead/config.h
@@ -136,11 +136,6 @@
 
 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