anv: Advertise support for VK_KHR_storage_buffer_storage_class

[mesa.git] / scons / custom.py

diff --git a/scons/custom.py b/scons/custom.py
index e66f49696239d357d095b2cfc78c2481b8c3c3e8..955247ccf2045424c32bffb19429a964a59d1398 100644 (file)
--- a/scons/custom.py
+++ b/scons/custom.py
@@ -103,8 +103,14 @@ def python_scan(node, env, path):
     # http://www.scons.org/doc/0.98.5/HTML/scons-user/c2781.html#AEN2789
     # https://docs.python.org/2/library/modulefinder.html
     contents = node.get_contents()
-    source_dir = node.get_dir()
-    finder = modulefinder.ModuleFinder()
+
+    # Tell ModuleFinder to search dependencies in the script dir, and the glapi
+    # dirs
+    source_dir = node.get_dir().abspath
+    GLAPI = env.Dir('#src/mapi/glapi/gen').abspath
+    path = [source_dir, GLAPI] + sys.path
+
+    finder = modulefinder.ModuleFinder(path=path)
     finder.run_script(node.abspath)
     results = []
     for name, mod in finder.modules.iteritems():
@@ -275,7 +281,7 @@ def parse_source_list(env, filename, names=None):
                     # cause duplicate actions.
                     f = f[len(cur_srcdir + '/'):]
                 # do not include any headers
-                if f.endswith('.h'):
+                if f.endswith(tuple(['.h','.hpp','.inl'])):
                     continue
                 srcs.append(f)