aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-10-06 19:54:15 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-10-06 19:54:15 +0300
commit5f73db97e819b2beda615862faadcd065ddd48df (patch)
tree34913eb327453e0b7a6a19b39b6266f5bc60918f
parent6694d01a16d7c87546fa80614a86072342ce3742 (diff)
downloadmeson-5f73db97e819b2beda615862faadcd065ddd48df.zip
meson-5f73db97e819b2beda615862faadcd065ddd48df.tar.gz
meson-5f73db97e819b2beda615862faadcd065ddd48df.tar.bz2
Some windows fixes.
-rw-r--r--environment.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/environment.py b/environment.py
index 94290c1..c7f88de 100644
--- a/environment.py
+++ b/environment.py
@@ -62,7 +62,7 @@ class CCompiler():
def split_shlib_to_parts(self, fname):
return (None, fname)
- def build_rpath_arg(self, build_dir, rpath_paths):
+ def build_rpath_args(self, build_dir, rpath_paths):
return []
def get_id(self):
@@ -405,10 +405,10 @@ class VisualStudioCCompiler(CCompiler):
def get_std_opt_flags(self):
return VisualStudioCCompiler.std_opt_flags
-
+
def get_pch_suffix(self):
return 'pch'
-
+
def get_pch_name(self, header):
chopped = os.path.split(header)[-1].split('.')[:-1]
chopped.append(self.get_pch_suffix())
@@ -646,7 +646,7 @@ class VisualStudioLinker():
always_flags = ['/NOLOGO']
def __init__(self, exelist):
self.exelist = exelist
-
+
def get_exelist(self):
return self.exelist
@@ -662,6 +662,9 @@ class VisualStudioLinker():
def get_always_flags(self):
return VisualStudioLinker.always_flags
+ def build_rpath_args(self, build_dir, rpath_paths):
+ return []
+
class ArLinker():
std_flags = ['csr']
@@ -685,6 +688,7 @@ class ArLinker():
def get_always_flags(self):
return []
+
def exe_exists(arglist):
try:
p = subprocess.Popen(arglist, stdout=subprocess.PIPE, stderr=subprocess.PIPE)