diff options
| author | José Fonseca <[email protected]> | 2009-08-18 21:08:38 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2009-08-29 09:21:34 +0100 |
| commit | 556eecea67354068f6e328da6564bef6cb74cb4e (patch) | |
| tree | 6d2aa140009529d3fafb02814046395f39f9954d /src/gallium | |
| parent | 2fef9b3369d1b017a5360d53a75286234ace2c9d (diff) | |
llvmpipe: Allow to build without udis86.
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_bld_debug.c | 6 | ||||
| -rw-r--r-- | src/gallium/winsys/xlib/SConscript | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript index b880ca0d68e..97af1b95c34 100644 --- a/src/gallium/drivers/llvmpipe/SConscript +++ b/src/gallium/drivers/llvmpipe/SConscript @@ -2,6 +2,7 @@ Import('*') env = env.Clone() +env.Tool('udis86') env.ParseConfig('llvm-config --cppflags') llvmpipe = env.ConvenienceLibrary( @@ -57,7 +58,6 @@ llvmpipe = env.ConvenienceLibrary( env = env.Clone() -env.Prepend(LIBS = 'udis86') env['LINK'] = env['CXX'] env.ParseConfig('llvm-config --libs jit interpreter nativecodegen bitwriter') env.Prepend(LIBS = [llvmpipe] + auxiliaries) diff --git a/src/gallium/drivers/llvmpipe/lp_bld_debug.c b/src/gallium/drivers/llvmpipe/lp_bld_debug.c index f8da1c9f8e7..ccbafca8b86 100644 --- a/src/gallium/drivers/llvmpipe/lp_bld_debug.c +++ b/src/gallium/drivers/llvmpipe/lp_bld_debug.c @@ -26,7 +26,9 @@ **************************************************************************/ +#ifdef HAVE_UDIS86 #include <udis86.h> +#endif #include "util/u_debug.h" #include "lp_bld_debug.h" @@ -35,6 +37,7 @@ void lp_disassemble(const void* func) { +#ifdef HAVE_UDIS86 ud_t ud_obj; ud_init(&ud_obj); @@ -69,4 +72,7 @@ lp_disassemble(const void* func) break; } debug_printf("\n"); +#else + (void)func; +#endif } diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript index d2be07b384e..518fd2b5a84 100644 --- a/src/gallium/winsys/xlib/SConscript +++ b/src/gallium/winsys/xlib/SConscript @@ -31,7 +31,7 @@ if env['platform'] == 'linux' \ if 'llvmpipe' in env['drivers']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') - env.Prepend(LIBS = 'udis86') + env.Tool('udis86') env.ParseConfig('llvm-config --libs jit interpreter nativecodegen') env['LINK'] = env['CXX'] sources += ['xlib_llvmpipe.c'] |