Merge pull request #99 from TingPing/meson-cleanup

build: Clean up some Meson usage
macos/v1.5.9
Emmanuele Bassi 8 years ago committed by GitHub
commit 50272b7042
  1. 8
      include/epoxy/meson.build
  2. 8
      meson.build
  3. 8
      src/meson.build

@ -8,7 +8,7 @@ gl_generated = custom_target('gl_generated.h',
gen_dispatch_py,
'--header',
'--no-source',
'--outputdir=' + meson.current_build_dir(),
'--outputdir=@OUTDIR@',
'@INPUT@'
],
install: true,
@ -28,7 +28,7 @@ if build_egl
gen_dispatch_py,
'--header',
'--no-source',
'--outputdir=' + meson.current_build_dir(),
'--outputdir=@OUTDIR@',
'@INPUT@'
],
install: true,
@ -48,7 +48,7 @@ if build_glx
gen_dispatch_py,
'--header',
'--no-source',
'--outputdir=' + meson.current_build_dir(),
'--outputdir=@OUTDIR@',
'@INPUT@'
],
install: true,
@ -68,7 +68,7 @@ if build_wgl
gen_dispatch_py,
'--header',
'--no-source',
'--outputdir=' + meson.current_build_dir(),
'--outputdir=@OUTDIR@',
'@INPUT@'
],
install: true,

@ -140,10 +140,10 @@ python = find_program('python3')
# Generates the dispatch tables
gen_dispatch_py = find_program('src/gen_dispatch.py')
gl_registry = join_paths(meson.source_root(), 'registry/gl.xml')
egl_registry = join_paths(meson.source_root(), 'registry/egl.xml')
glx_registry = join_paths(meson.source_root(), 'registry/glx.xml')
wgl_registry = join_paths(meson.source_root(), 'registry/wgl.xml')
gl_registry = files('registry/gl.xml')
egl_registry = files('registry/egl.xml')
glx_registry = files('registry/glx.xml')
wgl_registry = files('registry/wgl.xml')
libepoxy_inc = [
include_directories('include'),

@ -16,7 +16,7 @@ gl_generated = custom_target('gl_generated_dispatch.c',
gen_dispatch_py,
'--source',
'--no-header',
'--outputdir=' + meson.current_build_dir(),
'--outputdir=@OUTDIR@',
'@INPUT@',
])
@ -34,7 +34,7 @@ if build_egl
gen_dispatch_py,
'--source',
'--no-header',
'--outputdir=' + meson.current_build_dir(),
'--outputdir=@OUTDIR@',
'@INPUT@',
])
gen_sources += [ egl_generated ]
@ -52,7 +52,7 @@ if build_glx
gen_dispatch_py,
'--source',
'--no-header',
'--outputdir=' + meson.current_build_dir(),
'--outputdir=@OUTDIR@',
'@INPUT@',
])
gen_sources += [ glx_generated ]
@ -70,7 +70,7 @@ if build_wgl
gen_dispatch_py,
'--source',
'--no-header',
'--outputdir=' + meson.current_build_dir(),
'--outputdir=@OUTDIR@',
'@INPUT@',
])
gen_sources += [ wgl_generated ]

Loading…
Cancel
Save