summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2011-03-02 02:26:35 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2011-03-02 02:26:35 (GMT)
commitffc637041019f2689920d827c6930371e18a85d3 (patch)
treee7deec393db1cdea40919ebb34c8283092f42de9 /src
parentb25e8d31d6d60f73780309ff9a00cb1b23a58f73 (diff)
downloadSCons-ffc637041019f2689920d827c6930371e18a85d3.zip
SCons-ffc637041019f2689920d827c6930371e18a85d3.tar.gz
SCons-ffc637041019f2689920d827c6930371e18a85d3.tar.bz2
Fix issue #1632: quote /Fp in PCH to make precompiled hdrs work with variant dirs containing spaces.
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt3
-rw-r--r--src/RELEASE.txt2
-rw-r--r--src/engine/SCons/Tool/msvc.py2
3 files changed, 6 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 8bb1bb7..2231cef 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -7,6 +7,9 @@
RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+ From Gary Oberbrunner:
+ - Fix precompiled headers on Windows when variant dir name has spaces.
+
From Gary Oberbrunner and Sohail Somani:
- new construction variable WINDOWS_EMBED_MANIFEST to automatically
embed manifests in Windows EXEs and DLLs.
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index f8db734..5ceb8d7 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -56,6 +56,8 @@
FIXES
+ - Precompiled headers on Windows no longer break when used with
+ variant dirs containing spaces.
- Delete can now delete symlinks to directories and broken symlinks
- CPPDEFINES containing dictionaries now work better.
- A problem with using implicit-cache and removing dependencies on
diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index 41e793a..066b5e5 100644
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -208,7 +208,7 @@ def generate(env):
shared_obj.add_emitter(suffix, shared_object_emitter)
env['CCPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Z7") or ""}'])
- env['CCPCHFLAGS'] = SCons.Util.CLVar(['${(PCH and "/Yu%s /Fp%s"%(PCHSTOP or "",File(PCH))) or ""}'])
+ env['CCPCHFLAGS'] = SCons.Util.CLVar(['${(PCH and "/Yu%s \\\"/Fp%s\\\""%(PCHSTOP or "",File(PCH))) or ""}'])
env['_MSVC_OUTPUT_FLAG'] = msvc_output_flag
env['_CCCOMCOM'] = '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $CCPCHFLAGS $CCPDBFLAGS'
env['CC'] = 'cl'