From 4703c93aaecf0d5794eca723cd5b1b72b04d04ee Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 20 Jun 2011 09:33:04 +0200
Subject: libX11 xserver mesa git update 20 June 2011

---
 mesalib/src/mapi/glapi/SConscript | 169 ++++++++++++++++++--------------------
 1 file changed, 81 insertions(+), 88 deletions(-)

(limited to 'mesalib/src/mapi')

diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index d2bc3bafc..a7764745e 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -1,88 +1,81 @@
-#######################################################################
-# SConscript for glapi
-
-
-Import('*')
-
-if env['platform'] != 'winddk':
-
-    env = env.Clone()
-    
-    env.Append(CPPDEFINES = [
-        'MAPI_MODE_UTIL',
-    ])
-
-    if env['platform'] == 'windows':
-        env.Append(CPPDEFINES = [
-            '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
-            'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
-        ])
-        if env['gles']:
-            env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])
-        else:
-            # prevent _glapi_* from being declared __declspec(dllimport)
-            env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
-
-    env.Append(CPPPATH = [
-        '#/src/mapi',
-        '#/src/mesa',
-    ])
-    
-    glapi_sources = [
-        'glapi_dispatch.c',
-        'glapi_entrypoint.c',
-        'glapi_getproc.c',
-        'glapi_nop.c',
-        'glthread.c',
-        'glapi.c',
-    ]
-    
-    mapi_sources = [
-        'u_current.c',
-        'u_execmem.c',
-        'u_thread.c',
-    ]
-    for s in mapi_sources:
-        o = env.SharedObject(s[:-2], '../mapi/' + s)
-        glapi_sources.append(o)
-
-    #
-    # Assembly sources
-    #
-    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',
-            ])
-            glapi_sources += [
-                'glapi_x86.S',
-            ]
-        elif env['machine'] == 'x86_64':
-            env.Append(CPPDEFINES = [
-                'USE_X86_64_ASM', 
-            ])
-            glapi_sources += [
-                'glapi_x86-64.S'
-            ]
-        elif env['machine'] == 'ppc':
-            env.Append(CPPDEFINES = [
-                'USE_PPC_ASM', 
-                'USE_VMX_ASM', 
-            ])
-            glapi_sources += [
-            ]
-        elif env['machine'] == 'sparc':
-            glapi_sources += [
-                'glapi_sparc.S'
-            ]
-        else:
-            pass
-    
-    glapi = env.ConvenienceLibrary(
-        target = 'glapi',
-        source = glapi_sources,
-    )
-    Export('glapi')
+#######################################################################
+# SConscript for glapi
+
+
+Import('*')
+
+if env['platform'] != 'winddk':
+
+    env = env.Clone()
+    
+    env.Append(CPPDEFINES = [
+        'MAPI_MODE_UTIL',
+    ])
+
+    if env['platform'] == 'windows':
+        env.Append(CPPDEFINES = [
+            '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
+            'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
+        ])
+        if env['gles']:
+            env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])
+        else:
+            # prevent _glapi_* from being declared __declspec(dllimport)
+            env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
+
+    env.Append(CPPPATH = [
+        '#/src/mapi',
+        '#/src/mesa',
+    ])
+    
+    glapi_sources = [
+        'glapi_dispatch.c',
+        'glapi_entrypoint.c',
+        'glapi_getproc.c',
+        'glapi_nop.c',
+        'glthread.c',
+        'glapi.c',
+    ]
+    
+    mapi_sources = [
+        'u_current.c',
+        'u_execmem.c',
+        'u_thread.c',
+    ]
+    for s in mapi_sources:
+        o = env.SharedObject(s[:-2], '../mapi/' + s)
+        glapi_sources.append(o)
+
+    #
+    # Assembly sources
+    #
+    if env['gcc'] and env['platform'] != 'windows':
+        if env['machine'] == 'x86':
+            env.Append(CPPDEFINES = [
+                'USE_X86_ASM',
+            ])
+            glapi_sources += [
+                'glapi_x86.S',
+            ]
+        elif env['machine'] == 'x86_64':
+            env.Append(CPPDEFINES = [
+                'USE_X86_64_ASM',
+            ])
+            glapi_sources += [
+                'glapi_x86-64.S'
+            ]
+        elif env['machine'] == 'sparc':
+            env.Append(CPPDEFINES = [
+                'USE_SPARC_ASM',
+            ])
+            glapi_sources += [
+                'glapi_sparc.S'
+            ]
+        else:
+            pass
+    
+    glapi = env.ConvenienceLibrary(
+        target = 'glapi',
+        source = glapi_sources,
+    )
+    Export('glapi')
-- 
cgit v1.2.3