aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-06-03 17:56:31 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-06-03 17:56:31 +0300
commitaa38b1859fbbded725eac001b077b4230fb6332e (patch)
tree4215e7b34077b67c0c3ac87f15d469d3712c5f88
parent4637e07734473b16cec63df5f7b55941312babb5 (diff)
downloadmeson-aa38b1859fbbded725eac001b077b4230fb6332e.zip
meson-aa38b1859fbbded725eac001b077b4230fb6332e.tar.gz
meson-aa38b1859fbbded725eac001b077b4230fb6332e.tar.bz2
A few windows fixes.
-rwxr-xr-xbackends.py2
-rwxr-xr-xenvironment.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/backends.py b/backends.py
index a8579de..427a421 100755
--- a/backends.py
+++ b/backends.py
@@ -30,7 +30,7 @@ else:
execute_wrapper = ''
def ninja_quote(text):
- return text.replace(' ', '$ ')
+ return text.replace(' ', '$ ').replace(':', '$:')
def do_replacement(regex, line, confdata):
match = re.search(regex, line)
diff --git a/environment.py b/environment.py
index 6fbe85e..1660656 100755
--- a/environment.py
+++ b/environment.py
@@ -256,6 +256,8 @@ class VisualStudioCCompiler(CCompiler):
return ['/c']
def get_output_flags(self, target):
+ if target.endswith('.exe'):
+ return ['/Fe' + target]
return ['/Fo' + target]
def get_dependency_gen_flags(self, outtarget, outfile):