projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gbm: remove unnecessary meson include
[mesa.git]
/
src
/
gbm
/
meson.build
diff --git
a/src/gbm/meson.build
b/src/gbm/meson.build
index f25f3172027794f1cc4f157092f32ba9d3f8d463..719f9c1a9b8a59bbbe414d9ad82e107d49ab0c82 100644
(file)
--- a/
src/gbm/meson.build
+++ b/
src/gbm/meson.build
@@
-18,7
+18,7
@@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
# 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',
files_gbm = files(
'main/backend.c',
@@
-29,34
+29,29
@@
files_gbm = files(
)
deps_gbm = []
args_gbm = []
)
deps_gbm = []
args_gbm = []
-links_gbm = []
deps_gbm = []
incs_gbm = [
include_directories('main'), inc_include, inc_src, inc_loader,
deps_gbm = []
incs_gbm = [
include_directories('main'), inc_include, inc_src, inc_loader,
- inc_wayland_drm,
]
if with_dri2
files_gbm += files('backends/dri/gbm_dri.c', 'backends/dri/gbm_driint.h')
deps_gbm += dep_libdrm # TODO: pthread-stubs
]
if with_dri2
files_gbm += files('backends/dri/gbm_dri.c', 'backends/dri/gbm_driint.h')
deps_gbm += dep_libdrm # TODO: pthread-stubs
- args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_
driver_dir
)
+ args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_
search_path
)
endif
if with_platform_wayland
deps_gbm += dep_wayland_server
endif
if with_platform_wayland
deps_gbm += dep_wayland_server
- links_gbm += libwayland_drm
incs_gbm += inc_wayland_drm
endif
incs_gbm += inc_wayland_drm
endif
-# TODO: wayland support (requires egl)
-
libgbm = shared_library(
'gbm',
files_gbm,
include_directories : incs_gbm,
c_args : [c_vis_args, args_gbm],
link_args : [ld_args_gc_sections],
libgbm = shared_library(
'gbm',
files_gbm,
include_directories : incs_gbm,
c_args : [c_vis_args, args_gbm],
link_args : [ld_args_gc_sections],
- link_with : [li
nks_gbm, li
bloader, libmesa_util, libxmlconfig],
- dependencies : [deps_gbm, dep_dl],
+ link_with : [libloader, libmesa_util, libxmlconfig],
+ dependencies : [deps_gbm, dep_dl
, dep_thread
],
version : '1.0.0',
install : true,
)
version : '1.0.0',
install : true,
)
@@
-73,8
+68,10
@@
pkg.generate(
)
if with_tests
)
if with_tests
- test('gbm-symbols-check',
+ test(
+ 'gbm-symbols-check',
find_program('gbm-symbols-check'),
find_program('gbm-symbols-check'),
+ env : env_test,
args : libgbm
)
endif
args : libgbm
)
endif