On 01/06/2013 03:14 PM, Alex wrote:
* We have a symbol conflict as rtasm in
Mesa collides with rtasm in gallium.
* As us linking gallium and mesa together
is an edge case, lets just omit the rtasm
code from Mesa as we should be going
llvmpipe soon :)
---
src/mesa/SConscript | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index a2492f7..a28db23 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -370,7 +370,7 @@ env.Depends(glget_sources, get_hash_header)
#
# Assembly sources
#
-if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
+if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows',
'haiku'):
if env['machine'] == 'x86':
env.Append(CPPDEFINES = [
'USE_X86_ASM',
Reviewed-by: Brian Paul <bri...@vmware.com>
Do you need someone to commit these for you?
-Brian
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
