X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FSConscript;h=d328fc13c48d1a954b6b28d4c9308d37d18bba2c;hb=bceb5f36ec9a8fdda515102c3e52f41aa6cad1c5;hp=3cd0f87ef5f1171ca820c345bd71873b4e60136c;hpb=815ca0bf38de89cff533a413066a7e23a0aa5fb0;p=mesa.git

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 3cd0f87ef5f..d328fc13c48 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -31,7 +31,6 @@ if env['platform'] == 'windows':
         env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
 else:
     env.Append(CPPDEFINES = [
-        'IN_DRI_DRIVER', # enable the remap table (for DRI drivers)
         ('HAVE_DLOPEN', '1'),
     ])
 
@@ -351,7 +350,8 @@ get_hash_header = env.CodeGenerate(
 #
 # Assembly sources
 #
-if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
+if (env['gcc'] or env['clang']) and \
+   env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
     if env['machine'] == 'x86':
         env.Append(CPPDEFINES = [
             'USE_X86_ASM',
@@ -417,23 +417,6 @@ if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'
         env.Append(CPPPATH = [matypes[0].dir])
 
 
-# The enums.c file is generated from the GL/ES API.xml file
-env.CodeGenerate(
-    target = 'main/enums.c',
-    script = GLAPI + 'gen/gl_enums.py',
-    source = GLAPI + 'gen/gl_and_es_API.xml',
-    command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
-    )
-
-# The api_exec.c file is generated from the GL/ES API.xml file
-env.CodeGenerate(
-    target = 'main/api_exec.c',
-    script = GLAPI + 'gen/gl_genexec.py',
-    source = GLAPI + 'gen/gl_and_es_API.xml',
-    command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
-    )
-
-
 def write_git_sha1_h_file(filename):
     """Mesa looks for a git_sha1.h file at compile time in order to display
     the current git hash id in the GL_VERSION string.  This function tries