diff options
| author | Steven Knight <knight@baldmt.com> | 2005-02-28 00:05:55 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-02-28 00:05:55 (GMT) |
| commit | 69e1562853db2f1836a0942e1cc01aeb87858a9d (patch) | |
| tree | c18f80c3df952d4caf5417febb0320ceaacb01c7 /src | |
| parent | d361a67553bcbcd42ba46de08859e73d7e98851e (diff) | |
| download | SCons-69e1562853db2f1836a0942e1cc01aeb87858a9d.zip SCons-69e1562853db2f1836a0942e1cc01aeb87858a9d.tar.gz SCons-69e1562853db2f1836a0942e1cc01aeb87858a9d.tar.bz2 | |
Add support for Objective C/C++ .m and .mm file extensions. (Timothee Besset)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/c++.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/cc.py | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index ae19676..4124c7c 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -25,6 +25,11 @@ RELEASE 0.97 - XXX - Allow Tools found on a toolpath to import Python modules from their local directory. + From Timothee Besset: + + - Add support for Objective C/C++ .m and .mm file suffixes (for + Mac OS X). + From Steve Christensen: - Handle exceptions from Python functions as build actions. diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 7010e1c..d9b1c30 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -55,6 +55,7 @@ SourceFileScanner = SCons.Scanner.Scanner({}, name='SourceFileScanner') CSuffixes = [".c", ".C", ".cxx", ".cpp", ".c++", ".cc", ".h", ".H", ".hxx", ".hpp", ".hh", ".F", ".fpp", ".FPP", + ".m", ".mm", ".S", ".spp", ".SPP"] DSuffixes = ['.d'] diff --git a/src/engine/SCons/Tool/c++.py b/src/engine/SCons/Tool/c++.py index 10bb1ac..90b01ae 100644 --- a/src/engine/SCons/Tool/c++.py +++ b/src/engine/SCons/Tool/c++.py @@ -40,7 +40,7 @@ import SCons.Util compilers = ['CC', 'c++'] -CXXSuffixes = ['.cpp', '.cc', '.cxx', '.c++', '.C++'] +CXXSuffixes = ['.cpp', '.cc', '.cxx', '.c++', '.C++', '.mm'] if SCons.Util.case_sensitive_suffixes('.c', '.C'): CXXSuffixes.append('.C') diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py index 56c723d..8fb9e26 100644 --- a/src/engine/SCons/Tool/cc.py +++ b/src/engine/SCons/Tool/cc.py @@ -36,7 +36,7 @@ import SCons.Tool import SCons.Defaults import SCons.Util -CSuffixes = ['.c'] +CSuffixes = ['.c', '.m'] if not SCons.Util.case_sensitive_suffixes('.c', '.C'): CSuffixes.append('.C') |