mesa: Only mark textures as mipmap incomplete on MAX_LEVEL issues.

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 11e034f84a55c99a9d7a3cb7815ce00070a0db61..e03d6a6a3afc1586183e19128f0f0cb46dc817da 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -65,6 +65,7 @@ main_sources = [
     'main/enable.c',
     'main/enums.c',
     'main/errors.c',
+    'main/es1_conversion.c',
     'main/eval.c',
     'main/execmem.c',
     'main/extensions.c',
@@ -73,6 +74,7 @@ main_sources = [
     'main/ff_fragment_shader.cpp',
     'main/ffvertex_prog.c',
     'main/fog.c',
+    'main/formatquery.c',
     'main/formats.c',
     'main/format_pack.c',
     'main/format_unpack.c',
@@ -80,6 +82,7 @@ main_sources = [
     'main/getstring.c',
     'main/glformats.c',
     'main/hash.c',
+    'main/hash_table.c',
     'main/hint.c',
     'main/histogram.c',
     'main/image.c',
@@ -105,6 +108,7 @@ main_sources = [
     'main/renderbuffer.c',
     'main/samplerobj.c',
     'main/scissor.c',
+    'main/set.c',
     'main/shaderapi.c',
     'main/shaderobj.c',
     'main/shader_query.cpp',
@@ -291,7 +295,7 @@ env.Append(CPPPATH = [Dir('.').abspath])
 
 program_sources = [
     'program/arbprogparse.c',
-    'program/hash_table.c',
+    'program/prog_hash_table.c',
     'program/ir_to_mesa.cpp',
     'program/program.c',
     'program/program_parse_extra.c',
@@ -338,7 +342,7 @@ if env['gles']:
     enabled_apis += ['ES1', 'ES2']
 
     # generate GLES sources
-    gles_sources = ['main/es1_conversion.c',]
+    gles_sources = []
 
     # generate GLES headers
     gles_headers = []
@@ -367,7 +371,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',