Commit 6f628951 authored by Dylan Baker's avatar Dylan Baker

meson: Use include directory variables instead of traversing

Signed-off-by: Dylan Baker's avatarDylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Jon Turney's avatarJon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@imgtec.com>
Tested-by: Julien Isorce's avatarJulien Isorce <julien.isorce@gmail.com>
Tested-by: Karol Herbst's avatarKarol Herbst <kherbst@redhat.com>
parent 34e852d5
......@@ -18,10 +18,13 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
inc_egl = include_directories('.', 'main')
inc_egl_dri2 = include_directories('drivers/dri2')
c_args_for_egl = []
link_for_egl = []
deps_for_egl = []
incs_for_egl = [inc_include, inc_src, include_directories('main')]
incs_for_egl = [inc_include, inc_src, inc_egl]
files_egl = files(
'main/eglapi.c',
......
......@@ -18,6 +18,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
inc_st_dri = include_directories('.')
files_libdri = files(
'dri_context.c',
'dri_context.h',
......
......@@ -51,13 +51,11 @@ files_omx += files(
inc_st_omx = [
inc_st_omx,
inc_dri_common,
include_directories('../../state_trackers/dri'),
include_directories('../../../egl/drivers/dri2'),
include_directories('../../../egl/main'),
include_directories('../../../egl'),
include_directories('../../../gbm/backends/dri'),
include_directories('../../../gbm/main'),
include_directories('../../../loader')
inc_loader,
inc_gbm,
inc_st_dri,
inc_egl,
inc_egl_dri2,
]
dep_st_omx = [dep_st_omx, dep_omx_other, dep_libdrm]
endif
......
......@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
inc_gbm = include_directories('.', 'backends/dri')
inc_gbm = include_directories('.', 'main', 'backends/dri')
files_gbm = files(
'main/backend.c',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment