diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2017-03-19 09:56:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-19 09:56:48 +0000 |
| commit | 3f932aeb2f635157788c9cbcda280f2ca808c725 (patch) | |
| tree | f7bea72f42d3b9f01eed216a78bf10b6068b44ba /meson.build | |
| parent | ab10a7996ba593c6527051dca11502dd33a17f4b (diff) | |
| parent | c39f16102ed1b22ad796e2416bb60792b9aa5571 (diff) | |
| download | libepoxy-3f932aeb2f635157788c9cbcda280f2ca808c725.tar.gz | |
Merge pull request #112 from accel2k/fix-msvc-build
Fix build on MSVC
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meson.build b/meson.build index a513f5f..7d9afd9 100644 --- a/meson.build +++ b/meson.build @@ -159,6 +159,14 @@ if libtype == 'shared' endif endif +# The inline keyword is available only for C++ in MSVC. +# So we need to use Microsoft specific __inline. +if host_system == 'windows' + if cc.get_id() == 'msvc' + conf.set('inline', '__inline') + endif +endif + # Dependencies dl_dep = cc.find_library('dl', required: false) gl_dep = dependency('gl', required: false) |