appleglx: Improve error reporting if CGLChoosePixelFormat() didn't find any matching...

[mesa.git] / src / glx / SConscript

diff --git a/src/glx/SConscript b/src/glx/SConscript
index c921eef70372c564920ad358883a56164d6b3683..cc36bf07a890fd2163da6d5cfcd523e0f92c6239 100644 (file)
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -11,6 +11,7 @@ env.Prepend(CPPPATH = [
        '.',           # the build/<platform>/glx/ directory
        '#include',
        '#include/GL/internal',
+       '#src/loader',
        '#src/mesa',
        '#src/mapi',
        '#src/mapi/glapi',
@@ -26,6 +27,7 @@ env.Append(CPPDEFINES = [
 ])
 
 env.Prepend(LIBS = [
+    libloader,
     glapi
 ])
 
@@ -63,6 +65,7 @@ sources = [
     'indirect_vertex_program.c',
     'pixel.c',
     'pixelstore.c',
+    'query_renderer.c',
     'render2.c',
     'renderpix.c',
     'single2.c',
@@ -78,6 +81,8 @@ sources = [
     'glxhash.c',
     'dri2_glx.c',
     'dri2.c',
+    'dri2_query_renderer.c',
+    #'dri3_glx.c',
     'applegl_glx.c',
 ]
 
@@ -92,48 +97,44 @@ libgl = env.SharedLibrary(
 # used by other targets as well.
 
 GLAPI = '#src/mapi/glapi/'
+sources = [GLAPI + 'gen/gl_API.xml'] + env.Glob(GLAPI + 'gen/*.xml')
 
 env.CodeGenerate(
     target = 'indirect.c',
     script = GLAPI + 'gen/glX_proto_send.py',
-    source = GLAPI + 'gen/gl_and_es_API.xml',
+    source = sources,
     command = python_cmd + ' $SCRIPT -f $SOURCE -m proto > $TARGET'
     )
 
 env.CodeGenerate(
     target = 'indirect_size.c', 
     script = GLAPI + 'gen/glX_proto_size.py',
-    source = GLAPI + 'gen/gl_API.xml',
+    source = sources,
     command = python_cmd + ' $SCRIPT -f $SOURCE -m size_c --only-set > $TARGET'
 )
 
 env.CodeGenerate(
     target = 'indirect_init.c', 
     script = GLAPI + 'gen/glX_proto_send.py',
-    source = GLAPI + 'gen/gl_API.xml',
+    source = sources,
     command = python_cmd + ' $SCRIPT -f $SOURCE -m init_c > $TARGET'
 )
 
-headers = []
-
-headers += env.CodeGenerate(
+env.CodeGenerate(
     target = 'indirect_size.h',
     script = GLAPI + 'gen/glX_proto_size.py',
-    source = GLAPI + 'gen/gl_API.xml',
+    source = sources,
     command = python_cmd + ' $SCRIPT -f $SOURCE -m size_h --only-set -h _INDIRECT_SIZE_H > $TARGET'
 )
 
-headers += env.CodeGenerate(
+env.CodeGenerate(
     target = 'indirect.h',
     script = GLAPI + 'gen/glX_proto_send.py',
-    source = GLAPI + 'gen/gl_API.xml',
+    source = sources,
     command = python_cmd + ' $SCRIPT -m init_h -f $SOURCE > $TARGET',
     )
 
 
-env.Depends(sources, headers)
-
-
 libgl = env.InstallSharedLibrary(libgl, version=(1, 2))
 
 env.Alias('glx', libgl)