diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-05-05 02:34:42 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-05-05 02:39:08 +0100 |
| commit | b2e343daab4a7621e2bd9bc4b2cbd2709370089c (patch) | |
| tree | 6db1b63f905905a55a441180afd5eeaa8be59b99 | |
| parent | ddb0e18f6c5582d4d2cc59ffd16ad9c4639ed059 (diff) | |
tests/raw: Get it building with scons.
| -rw-r--r-- | src/gallium/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/targets/graw-xlib/SConscript | 6 | ||||
| -rw-r--r-- | src/gallium/tests/raw/SConscript | 3 | ||||
| -rw-r--r-- | src/gallium/tests/raw/clear.c | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript index 6c0e7a518d..ed4d217379 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -25,4 +25,4 @@ SConscript('targets/SConscript') if platform != 'embedded': SConscript('tests/unit/SConscript') - #SConscript('tests/raw/SConscript') + SConscript('tests/raw/SConscript') diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript index 979252b22d..b30c2d9ab4 100644 --- a/src/gallium/targets/graw-xlib/SConscript +++ b/src/gallium/targets/graw-xlib/SConscript @@ -8,6 +8,8 @@ if env['platform'] != 'linux': env = env.Clone() +env.Tool('x11') + env.Prepend(LIBS = [ ws_xlib, trace, @@ -40,12 +42,10 @@ env.Prepend(LIBS = [gallium]) # TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions graw = env.SharedLibrary( - target ='graw', + target ='#lib/graw', source = sources, ) -env.InstallSharedLibrary(graw, version=(1, 0)) - graw = env.FindIxes(graw, 'SHLIBPREFIX', 'SHLIBSUFFIX') Export('graw') diff --git a/src/gallium/tests/raw/SConscript b/src/gallium/tests/raw/SConscript index 073b97951e..1b172e070f 100644 --- a/src/gallium/tests/raw/SConscript +++ b/src/gallium/tests/raw/SConscript @@ -1,5 +1,8 @@ Import('*') +if 'graw-xlib' not in env['winsys']: + Return() + env = env.Clone() env.Prepend(LIBPATH = [graw.dir]) diff --git a/src/gallium/tests/raw/clear.c b/src/gallium/tests/raw/clear.c index 706e3be372..52029008da 100644 --- a/src/gallium/tests/raw/clear.c +++ b/src/gallium/tests/raw/clear.c @@ -26,7 +26,7 @@ int main( int argc, char *argv[] ) struct pipe_context *pipe; struct pipe_surface *surf; struct pipe_framebuffer_state fb; - struct pipe_texture *tex, templat; + struct pipe_resource *tex, templat; void *window = NULL; float clear_color[4] = {1,0,1,1}; int i; |