Chromium Code Reviews| Index: SConstruct | 
| diff --git a/SConstruct b/SConstruct | 
| index 7ba59ef4fab2532be6654881d6c35924d69ce4d5..42bdb069081c902b34c8bd883c6e9233fe19ecb2 100644 | 
| --- a/SConstruct | 
| +++ b/SConstruct | 
| @@ -39,7 +39,7 @@ base_env.Append(CPPPATH=['..']) | 
| # We need glib-2.0 ONLY to satisfy libbase. | 
| # TODO(derat): Weep. | 
| base_env.Append(LIBS=Split('base gflags pthread rt')) | 
| -base_env.ParseConfig('pkg-config --cflags --libs glib-2.0 x11') | 
| +base_env.ParseConfig('pkg-config --cflags --libs glib-2.0 x11 xrender') | 
| 
 
Daniel Erat
2011/04/02 14:54:36
nit: this should be in wm_env below, not base_env
 
 | 
| # Fork off a new environment, add Cairo to it, and build the screenshot | 
| # program. | 
| @@ -134,6 +134,10 @@ elif backend == 'opengles': | 
| # opengles_visitor.cc includes "window_manager/compositor/gles/shaders.h", | 
| # while the shaders builder just provides "compositor/gles/shaders.h". | 
| Depends('compositor/gles/opengles_visitor.o', 'compositor/gles/shaders.h') | 
| +elif backend == 'xrender': | 
| + srcs.append(Split('''\ | 
| + compositor/xrender/xrender_visitor.cc | 
| + ''')) | 
| libwm_core = wm_env.Library('wm_core', srcs) | 
| @@ -150,7 +154,8 @@ libtest = wm_env.Library('test', Split(srcs)) | 
| wm_env.Prepend(LIBS=[libwm_core, libwm_ipc]) | 
| backend_defines = {'opengl': ['COMPOSITOR_OPENGL'], | 
| - 'opengles': ['COMPOSITOR_OPENGLES']} | 
| + 'opengles': ['COMPOSITOR_OPENGLES'], | 
| + 'xrender': ['COMPOSITOR_XRENDER']} | 
| wm_env.Append(CPPDEFINES=backend_defines[backend]) | 
| test_env = wm_env.Clone() | 
| @@ -165,7 +170,8 @@ tests = [] | 
| # These are tests that only get built when we use particular backends. | 
| backend_tests = {'opengl': ['real_compositor_test.cc', | 
| 'opengl_visitor_test.cc'], | 
| - 'opengles': []} | 
| + 'opengles': [], | 
| + 'xrender': []} | 
| all_backend_tests = set(itertools.chain(*backend_tests.values())) | 
| for root, dirnames, filenames in os.walk('.'): | 
| for filename in fnmatch.filter(filenames, '*_test.cc'): |