Merge pull request #261 from arichardson/custom-prefix-build-fix

Fix build if EGL/X11 headers are in a custom prefix
macos/v1.5.9^2
Emmanuele Bassi 3 years ago committed by GitHub
commit 1c51cfbbe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      meson.build
  2. 6
      src/meson.build

@ -165,9 +165,11 @@ endif
dl_dep = cc.find_library('dl', required: false) dl_dep = cc.find_library('dl', required: false)
gl_dep = dependency('gl', required: false) gl_dep = dependency('gl', required: false)
egl_dep = dependency('egl', required: false) egl_dep = dependency('egl', required: false)
elg_headers_dep = egl_dep.partial_dependency(compile_args: true, includes: true)
# Optional dependencies for tests # Optional dependencies for tests
x11_dep = dependency('x11', required: false) x11_dep = dependency('x11', required: false)
x11_headers_dep = x11_dep.partial_dependency(compile_args: true, includes: true)
# GLES v2 and v1 may have pkg-config files, courtesy of downstream # GLES v2 and v1 may have pkg-config files, courtesy of downstream
# packagers; let's check those first, and fall back to find_library() # packagers; let's check those first, and fall back to find_library()

@ -59,6 +59,12 @@ epoxy_deps = [ dl_dep, ]
if host_system == 'windows' if host_system == 'windows'
epoxy_deps += [ opengl32_dep, gdi32_dep ] epoxy_deps += [ opengl32_dep, gdi32_dep ]
endif endif
if enable_x11
epoxy_deps += [ x11_headers_dep, ]
endif
if build_egl
epoxy_deps += [ elg_headers_dep, ]
endif
libepoxy = library( libepoxy = library(
'epoxy', 'epoxy',

Loading…
Cancel
Save