diff options
| author | Alexander von Gluck IV <[email protected]> | 2013-01-06 16:06:37 -0600 |
|---|---|---|
| committer | Alexander von Gluck IV <[email protected]> | 2013-01-07 17:39:49 -0600 |
| commit | b9227b3e15d8e8d4e6e96efbad940a32c0853c19 (patch) | |
| tree | da97a11b1f2ed7f0b9c8de117f1a2ae3b943bc16 /src/mesa | |
| parent | 4332f6fc185f968e7563e748b8c949021937c935 (diff) | |
mesa: Don't use rtasm for Haiku swrast
* 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 :)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index a2492f7716f..a28db23e45a 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', |