diff options
author | Dylan Baker <[email protected]> | 2017-09-20 20:11:32 -0700 |
---|---|---|
committer | Dylan Baker <[email protected]> | 2017-10-09 13:42:44 -0700 |
commit | 3218056e0eb375eeda470058d06add1532acd6d4 (patch) | |
tree | b634c97a95770f05b640a41215b33efdb4ed69f3 /src/meson.build | |
parent | 86eb09a136c62748eafa2dc79e10dbd681797cbf (diff) |
meson: Build i965 and dri stack
This gets pretty much the entire classic tree building, as well as
i965, including the various glapis. There are some workarounds for bugs
that are fixed in meson 0.43.0, which is due out on October 8th.
I have tested this with piglit using glx.
v2: - fix typo "vaule" -> "value"
- use gtest dep instead of linking to libgtest (rebase error)
- use gtest dep instead of linking against libgtest (rebase error)
- copy the megadriver, then create hard links from that, then delete
the megadriver. This matches the behavior of the autotools build.
(Eric A)
- Use host_machine instead of target_machine (Eric A)
- Put a comment in the right place (Eric A)
- Don't have two variables for the same information (Eric A)
- Put pre_args at top of file in this patch (Eric A)
- Fix glx generators in this patch instead of next (Eric A)
- Remove -DMESON hack (Eric A)
- add sha1_h to mesa in this patch (Eric A)
- Put generators in loops when possible to reduce code in
mapi/glapi/gen (Eric A)
v3: - put HAVE_X11_PLATFORM in this patch
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/meson.build')
-rw-r--r-- | src/meson.build | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/meson.build b/src/meson.build index 76ff497e565..8e0860bb5a5 100644 --- 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 |