diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 21:24:33 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 21:24:33 +0000 |
| commit | f07adba7b2cf2eb355c104431f58ce991e0b81fb (patch) | |
| tree | 2478c11dc09e61782160d7686caede6cf9b828b0 /o3d/main.scons | |
| parent | 2e70f59de58d2d8d221260acb4d2d0e1f5f52658 (diff) | |
| download | chromium_src-f07adba7b2cf2eb355c104431f58ce991e0b81fb.zip chromium_src-f07adba7b2cf2eb355c104431f58ce991e0b81fb.tar.gz chromium_src-f07adba7b2cf2eb355c104431f58ce991e0b81fb.tar.bz2 | |
Move the build group addition out of the AddMacDebugSettings function.
This was adding all Mac debug builds to the default build group, so we were trying to build the
work-in-progress command buffer version and failing.
Review URL: http://codereview.chromium.org/174628
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/main.scons')
| -rw-r--r-- | o3d/main.scons | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/o3d/main.scons b/o3d/main.scons index 0c25ea0..7442af1 100644 --- a/o3d/main.scons +++ b/o3d/main.scons @@ -86,8 +86,10 @@ base_env.Append( DOCS_DIR = '$DESTINATION_ROOT/docs', CPPPATH = [ - # The internal dir is first so that headers in internal can replace
- # those in external.
+ # The internal dir is first so that headers in internal can replace + + # those in external. + '$INTERNAL_DIR', '$SCONSTRUCT_DIR/..', '$SCONSTRUCT_DIR', @@ -667,7 +669,6 @@ mac_env.Append(CPPDEFINES = ['RENDERER_GL', def AddMacDebugSettings(env): env.Append( - BUILD_GROUPS = ['default', 'most'], CCFLAGS = ['-g'], CPPDEFINES = ['_DEBUG'] ) @@ -754,6 +755,11 @@ mac_test_optimized_env = mac_optimized_env.Clone( AddTestingFlags(mac_test_optimized_env) environment_list.append(mac_test_optimized_env) +mac_debug_env.Append( + BUILD_GROUPS = ['default', 'most'], +) + + # Linux ------------------------------------------------------------------ linux_env = binaries_env.Clone( |