diff options
| author | Guido Günther <[email protected]> | 2019-05-31 14:35:08 +0200 |
|---|---|---|
| committer | Guido Günther <[email protected]> | 2019-06-05 08:58:05 +0000 |
| commit | b921df352d95886213d8a5db991c785c9bf5755c (patch) | |
| tree | 83befdf482232558069135cfbb45a7f6ed399052 /src/gallium | |
| parent | 3696235f8205e30c8478510fb9d8ff8f07b53d63 (diff) | |
build: Build etnaviv drm
Signed-off-by: Guido Günther <[email protected]>
Reviewed-by: Christian Gmeiner <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/etnaviv/meson.build | 15 | ||||
| -rw-r--r-- | src/gallium/winsys/etnaviv/drm/meson.build | 6 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build index 75ed93eccc7..c84f4449c63 100644 --- a/src/gallium/drivers/etnaviv/meson.build +++ b/src/gallium/drivers/etnaviv/meson.build @@ -93,18 +93,23 @@ libetnaviv = static_library( 'etnaviv', files_etnaviv, c_args : [c_vis_args], - include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux], - dependencies : dep_libdrm_etnaviv, + include_directories : [ + inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv, + ], + link_with: libetnaviv_drm, + dependencies : dep_libdrm, ) etnaviv_compiler = executable( 'etnaviv_compiler', 'etnaviv_compiler_cmdline.c', - include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux], - link_with : [libmesa_util, libgallium, libetnaviv], - dependencies : [dep_libdrm_etnaviv], + include_directories : [ + inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv, + ], + link_with : [libmesa_util, libgallium, libetnaviv, libetnaviv_drm], build_by_default : with_tools.contains('etnaviv'), install : with_tools.contains('etnaviv'), + dependencies : dep_libdrm, ) driver_etnaviv = declare_dependency( diff --git a/src/gallium/winsys/etnaviv/drm/meson.build b/src/gallium/winsys/etnaviv/drm/meson.build index 21bb6f67567..f931fd39e5b 100644 --- a/src/gallium/winsys/etnaviv/drm/meson.build +++ b/src/gallium/winsys/etnaviv/drm/meson.build @@ -22,7 +22,9 @@ libetnavivdrm = static_library( 'etnavivdrm', 'etnaviv_drm_winsys.c', include_directories : [ - inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers + inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers, + inc_etnaviv, ], - dependencies : dep_libdrm_etnaviv + link_with: libetnaviv_drm, + dependencies : [dep_libdrm], ) |