Mesa (master): scons: Correct glapi USE_xxx_ASM flags.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Fri Jun 17 19:13:46 UTC 2011


Module: Mesa
Branch: master
Commit: d6a0fe19e8da0cb12d73977e4e3ece596a26320f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d6a0fe19e8da0cb12d73977e4e3ece596a26320f

Author: José Fonseca <jfonseca at vmware.com>
Date:   Fri Jun 17 19:23:06 2011 +0100

scons: Correct glapi USE_xxx_ASM flags.

---

 src/mapi/glapi/SConscript |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index 276b216..a776474 100644
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -52,30 +52,23 @@ if env['platform'] != 'winddk':
     if env['gcc'] and env['platform'] != 'windows':
         if env['machine'] == 'x86':
             env.Append(CPPDEFINES = [
-                'USE_X86_ASM', 
-                'USE_MMX_ASM',
-                'USE_3DNOW_ASM',
-                'USE_SSE_ASM',
+                'USE_X86_ASM',
             ])
             glapi_sources += [
                 'glapi_x86.S',
             ]
         elif env['machine'] == 'x86_64':
             env.Append(CPPDEFINES = [
-                'USE_X86_64_ASM', 
+                'USE_X86_64_ASM',
             ])
             glapi_sources += [
                 'glapi_x86-64.S'
             ]
-        elif env['machine'] == 'ppc':
+        elif env['machine'] == 'sparc':
             env.Append(CPPDEFINES = [
-                'USE_PPC_ASM', 
-                'USE_VMX_ASM', 
+                'USE_SPARC_ASM',
             ])
             glapi_sources += [
-            ]
-        elif env['machine'] == 'sparc':
-            glapi_sources += [
                 'glapi_sparc.S'
             ]
         else:




More information about the mesa-commit mailing list