third_party
/
libepoxy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #99 from TingPing/meson-cleanup

Browse Source 
build: Clean up some Meson usage
macos/v1.5.9
Emmanuele Bassi 8 years ago committed by GitHub
parent 7c902e3e2b 61dac912e6
commit 50272b7042
3 changed files with 12 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      include/epoxy/meson.build
  2. 8
      meson.build
  3. 8
      src/meson.build

8
include/epoxy/meson.build
Unescape View File

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

8
meson.build
Unescape View File

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

8
src/meson.build
Unescape View File

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

Write Preview
Loading…
Cancel
Save