aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/mesonmain.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-06-05 13:00:57 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-06-05 13:00:57 +0300
commit0bc00560644d20daee626533fc6e6294d92caa78 (patch)
treeef21d8363c6943a3f18a33b07c9226ff6231164b /mesonbuild/mesonmain.py
parent177e286b3c761f461ac55ede934b941384b4bb97 (diff)
parentfba749fcb7a9654db78d45157477589e4352c2e1 (diff)
downloadmeson-0bc00560644d20daee626533fc6e6294d92caa78.zip
meson-0bc00560644d20daee626533fc6e6294d92caa78.tar.gz
meson-0bc00560644d20daee626533fc6e6294d92caa78.tar.bz2
Merge pull request #577 from nioncode/vs2015
Implement vs2015 backend
Diffstat (limited to 'mesonbuild/mesonmain.py')
-rw-r--r--mesonbuild/mesonmain.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 4f8314c..3f5612b 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -23,7 +23,6 @@ import platform
from . import mlog, coredata
from .mesonlib import MesonException
-backendlist = ['ninja', 'vs2010', 'xcode']
parser = argparse.ArgumentParser()
@@ -139,6 +138,9 @@ itself as required.'''
elif self.options.backend == 'vs2010':
from .backend import vs2010backend
g = vs2010backend.Vs2010Backend(b)
+ elif self.options.backend == 'vs2015':
+ from .backend import vs2015backend
+ g = vs2015backend.Vs2015Backend(b)
elif self.options.backend == 'xcode':
from .backend import xcodebackend
g = xcodebackend.XCodeBackend(b)