summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Scanner/RC.py
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2011-05-30 14:23:24 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2011-05-30 14:23:24 (GMT)
commit384ccd8cdf461a3b0933d164694d5d696d9437cf (patch)
tree9d07f3040db6e84208382e96b0a02066dd92271b /src/engine/SCons/Scanner/RC.py
parentb97b65360984b8769ea266b5412ee6ca789f71ce (diff)
downloadSCons-384ccd8cdf461a3b0933d164694d5d696d9437cf.zip
SCons-384ccd8cdf461a3b0933d164694d5d696d9437cf.tar.gz
SCons-384ccd8cdf461a3b0933d164694d5d696d9437cf.tar.bz2
Handle DOS line endings in RC scanner. Fixes #2747.
Diffstat (limited to 'src/engine/SCons/Scanner/RC.py')
-rw-r--r--src/engine/SCons/Scanner/RC.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Scanner/RC.py b/src/engine/SCons/Scanner/RC.py
index f8313fb..437b861 100644
--- a/src/engine/SCons/Scanner/RC.py
+++ b/src/engine/SCons/Scanner/RC.py
@@ -40,7 +40,7 @@ def RCScan():
res_re= r'^(?:\s*#\s*(?:include)|' \
'.*?\s+(?:ICON|BITMAP|CURSOR|HTML|FONT|MESSAGETABLE|TYPELIB|REGISTRY|D3DFX)' \
'\s*.*?)' \
- '\s*(<|"| )([^>"\s]+)(?:[>" ])*$'
+ '\s*(<|"| )([^>"\s]+)(?:[>"\s])*$'
resScanner = SCons.Scanner.ClassicCPP( "ResourceScanner",
"$RCSUFFIXES",
"CPPPATH",