diff options
| author | William Deegan <bill@baddogconsulting.com> | 2008-09-26 01:52:56 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2008-09-26 01:52:56 (GMT) |
| commit | cfd8f6a16b68336f33062625899d98427c511940 (patch) | |
| tree | 4f6015695d2c4a59c45e218b434997404f1445c1 | |
| parent | 2b944dafd38bf5825bdaea7b9c3eb3c76cb32617 (diff) | |
| download | SCons-cfd8f6a16b68336f33062625899d98427c511940.zip SCons-cfd8f6a16b68336f33062625899d98427c511940.tar.gz SCons-cfd8f6a16b68336f33062625899d98427c511940.tar.bz2 | |
Updated fix for bug 2082 adding support for D3DFX keyword and fixing python 1.5.2 issue
| -rw-r--r-- | src/engine/SCons/Scanner/RC.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/RCTests.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/engine/SCons/Scanner/RC.py b/src/engine/SCons/Scanner/RC.py index d7c6870..529cb5d 100644 --- a/src/engine/SCons/Scanner/RC.py +++ b/src/engine/SCons/Scanner/RC.py @@ -38,9 +38,9 @@ def RCScan(): """Return a prototype Scanner instance for scanning RC source files""" res_re= r'^(?:\s*#\s*(?:include)|' \ - '.*?\s+(?:ICON|BITMAP|CURSOR|HTML|FONT|MESSAGETABLE|TYPELIB|REGISTRY)' \ + '.*?\s+(?:ICON|BITMAP|CURSOR|HTML|FONT|MESSAGETABLE|TYPELIB|REGISTRY|D3DFX)' \ '\s*.*?)' \ - '\s*(<|"| )([^>" \Z\t]+)(?:[>" ])*$' + '\s*(<|"| )([^>"\s]+)(?:[>" ])*$' resScanner = SCons.Scanner.ClassicCPP( "ResourceScanner", "$RCSUFFIXES", "CPPPATH", diff --git a/src/engine/SCons/Scanner/RCTests.py b/src/engine/SCons/Scanner/RCTests.py index 61dbfb1..c7ac3e4 100644 --- a/src/engine/SCons/Scanner/RCTests.py +++ b/src/engine/SCons/Scanner/RCTests.py @@ -54,12 +54,15 @@ ID_RESPONSE_ERROR_PAGE HTML "responseerrorpage.htm" 1 MESSAGETABLE MSG00410.bin 1 TYPELIB "testtypelib.tlb" TEST_REGIS REGISTRY MOVEABLE PURE "testregis.rgs" +TEST_D3DFX D3DFX DISCARDABLE "testEffect.fx" + """) # Create dummy include files headers = ['t1.h', 'abc.ico','def.bmp','bullseye.cur','responseerrorpage.htm','cmroman.fnt', + 'testEffect.fx', 'MSG00409.bin','MSG00410.bin','testtypelib.tlb','testregis.rgs'] for h in headers: @@ -140,6 +143,7 @@ class RCScannerTestCase2(unittest.TestCase): 'MSG00409.bin', 'responseerrorpage.htm', 't1.h', + 'testEffect.fx', 'testregis.rgs','testtypelib.tlb'] deps_match(self, deps, headers) |