|
 |
87bc0b2 |
From e0cde8741295d08b599f39f33a2a95eef5fd5b87 Mon Sep 17 00:00:00 2001
|
|
|
87bc0b2 |
From: Robin Dunn <robin@alldunn.com>
|
|
|
87bc0b2 |
Date: Sat, 5 May 2018 21:03:30 -0700
|
|
|
87bc0b2 |
Subject: [PATCH] Update waf to version 2.0.7
|
|
|
87bc0b2 |
|
|
|
87bc0b2 |
---
|
|
|
87bc0b2 |
build.py | 4 ++--
|
|
|
87bc0b2 |
wscript | 4 ++--
|
|
|
87bc0b2 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
87bc0b2 |
|
|
|
87bc0b2 |
diff --git a/build.py b/build.py
|
|
|
87bc0b2 |
index 4117e85f7..518012b16 100755
|
|
|
87bc0b2 |
--- a/build.py
|
|
|
87bc0b2 |
+++ b/build.py
|
|
|
87bc0b2 |
@@ -83,8 +83,8 @@
|
|
|
87bc0b2 |
'linux64' : 'b349127a4d46452936e4181d96b12c2d',
|
|
|
87bc0b2 |
}
|
|
|
87bc0b2 |
|
|
|
87bc0b2 |
-wafCurrentVersion = '1.7.15-p1'
|
|
|
87bc0b2 |
-wafMD5 = 'e44003373c965f4221bbdc4c9b846128'
|
|
|
87bc0b2 |
+wafCurrentVersion = '2.0.7'
|
|
|
87bc0b2 |
+wafMD5 = '48ac1250bcccd0674cf461937875ce9a'
|
|
|
87bc0b2 |
|
|
|
87bc0b2 |
doxygenCurrentVersion = '1.8.8'
|
|
|
87bc0b2 |
doxygenMD5 = {
|
|
|
87bc0b2 |
diff --git a/wscript b/wscript
|
|
|
87bc0b2 |
index d051ebbce..c4bc96fde 100644
|
|
|
87bc0b2 |
--- a/wscript
|
|
|
87bc0b2 |
+++ b/wscript
|
|
|
87bc0b2 |
@@ -30,7 +30,7 @@ def options(opt):
|
|
|
87bc0b2 |
if isWindows:
|
|
|
87bc0b2 |
opt.load('msvc')
|
|
|
87bc0b2 |
else:
|
|
|
87bc0b2 |
- opt.load('compiler_cc compiler_cxx')
|
|
|
87bc0b2 |
+ opt.load('compiler_c compiler_cxx')
|
|
|
87bc0b2 |
opt.load('python')
|
|
|
87bc0b2 |
|
|
|
87bc0b2 |
opt.add_option('--debug', dest='debug', action='store_true', default=False,
|
|
|
87bc0b2 |
@@ -78,7 +78,7 @@ def configure(conf):
|
|
|
87bc0b2 |
conf.env['MSVC_TARGETS'] = [conf.options.msvc_arch]
|
|
|
87bc0b2 |
conf.load('msvc')
|
|
|
87bc0b2 |
else:
|
|
|
87bc0b2 |
- conf.load('compiler_cc compiler_cxx')
|
|
|
87bc0b2 |
+ conf.load('compiler_c compiler_cxx')
|
|
|
87bc0b2 |
|
|
|
87bc0b2 |
if conf.options.python:
|
|
|
87bc0b2 |
conf.env.PYTHON = conf.options.python
|