Merge pull request #112 from accel2k/fix-msvc-build

Fix build on MSVC
anholt · Mar 19, 2017 · 3f932ae · 3f932ae
2 parents ab10a79 + c39f161
commit 3f932ae
Showing 1 changed file with 8 additions and 0 deletions.
diff --git 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)