tests/raw: Get it building with scons.

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 6c0e7a518d1b26ded73339207d8ec4e4a236102f..ed4d217379e1020b878b60551e8bda9a1671573a 100644 (file)
--- 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 979252b22d7301498b7b3dbac6e014996159d424..b30c2d9ab43df1541f0165aa7dfb019c0cee27af 100644 (file)
--- 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 073b97951e746127b9d3cfaa9958bc61d80e22a9..1b172e070fefe447c36d54e1c7ceb07ccde673e5 100644 (file)
--- 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 706e3be372833d5eb042abc787ef7979c86a264c..52029008da82c11c0ab492d2a894f78ce005b300 100644 (file)
--- 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;