projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4332f6f
)
mesa: Don't use rtasm for Haiku swrast
author
Alexander von Gluck IV
<kallisti5@unixzen.com>
Sun, 6 Jan 2013 22:06:37 +0000
(16:06 -0600)
committer
Alexander von Gluck IV
<kallisti5@unixzen.com>
Mon, 7 Jan 2013 23:39:49 +0000
(17:39 -0600)
* 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
patch
|
blob
|
history
diff --git
a/src/mesa/SConscript
b/src/mesa/SConscript
index a2492f7716fffc750b9b2c8d8bc346cb969ef4ca..a28db23e45a049bed3ac40588d7c8a96a75cf2e4 100644
(file)
--- 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',