X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmeson.build;h=c3b1ff00d001ac081bad1a18def830e1873d66a3;hb=49fa0747268af6aa22c89c5eacffe36bf93084d0;hp=4c82eec70f184194f261dccf3e6cbc53fd90f4b8;hpb=d1992255bb29054fa51763376d125183a9f602f3;p=mesa.git

diff --git a/src/meson.build b/src/meson.build
index 4c82eec70f1..c3b1ff00d00 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -18,31 +18,67 @@
 # 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('.')
+inc_gallium = include_directories('gallium/include')
+inc_gallium_aux = include_directories('gallium/auxiliary')
+
+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 = custom_target(
+  'git_sha1.h',
+  output : 'git_sha1.h',
+  command : [prog_python2, git_sha1_gen_py, '--output', '@OUTPUT@'],
+  build_always : true, # commit sha1 can change without having touched these files
+)
 
 subdir('gtest')
 subdir('util')
-#subdir('mapi/glapi/gen')
-# TODO: mapi
+subdir('mapi/glapi/gen')
+subdir('mapi')
 # TODO: opengl
-# TODO: glx
-# TODO: osmesa
 subdir('compiler')
 subdir('egl/wayland/wayland-drm')
 subdir('vulkan')
-# TODO: amd
-subdir('intel')
-# TODO: vc4
-# TODO: opengl_common
-# TODO: dri_glx
-# TODO: gbm
-# TODO: egl
-# TODO: radv
-# TODO: gallium
+subdir('amd')
+if with_gallium_vc4
+  subdir('broadcom')
+endif
+if with_dri_i965 or with_intel_vk
+  subdir('intel')
+endif
+subdir('mesa')
+subdir('loader')
+subdir('glx')
+if with_gbm
+  subdir('gbm')
+endif
+if with_egl
+  subdir('egl')
+endif
+subdir('gallium')
+
+# This must be after at least mesa, glx, and gallium, since libgl will be
+# defined in one of those subdirs depending on the glx provider.
+if with_glx != 'disabled'
+  pkg.generate(
+    name : 'gl',
+    description : 'Mesa OpenGL Library',
+    version : meson.project_version(),
+    libraries : libgl,
+    libraries_private : gl_priv_libs,
+    requires_private : gl_priv_reqs,
+    variables : ['glx_tls=yes'],
+  )
+endif