meson: Build i965 and dri stack

[mesa.git] / src / meson.build

diff --git a/src/meson.build b/src/meson.build
index 76ff497e56588408c102e177e4acc61cbad75bec..8e0860bb5a5ee56272fe0e83194a60d9d2afbb94 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -18,19 +18,31 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-# TODO: libglsl_util
-
-# TODO: git_sha. There's a meson builtin for this
-
 inc_common = include_directories(
   '../include', '.', 'mapi', 'mesa', 'gallium/include', 'gallium/auxiliary')
 inc_mesa = include_directories('mesa')
 inc_mapi = include_directories('mapi')
+inc_src = include_directories('.')
+
+libglsl_util = static_library(
+  'glsl_util',
+  files('mesa/main/extensions_table.c', 'mesa/main/imports.c',
+        'mesa/program/prog_parameter.c', 'mesa/program/symbol_table.c',
+        'mesa/program/dummy_errors.c'),
+  include_directories : [inc_common],
+  c_args : [c_vis_args],
+  build_by_default : false,
+)
+
+sha1_h = vcs_tag(
+  input : 'git_sha1.h.in',
+  output : 'git_sha1.h',
+)
 
 subdir('gtest')
 subdir('util')
-#subdir('mapi/glapi/gen')
-# TODO: mapi
+subdir('mapi/glapi/gen')
+subdir('mapi')
 # TODO: opengl
 # TODO: glx
 # TODO: osmesa
@@ -40,7 +52,7 @@ subdir('vulkan')
 subdir('amd')
 subdir('intel')
 # TODO: vc4
-# TODO: opengl_common
+subdir('mesa')
 # TODO: dri_glx
 # TODO: gbm
 # TODO: egl