Merge pull request #846 from RobinD42/update-waf

Update waf to version 2.0.7
This commit is contained in:
Robin Dunn
2018-05-05 22:54:15 -07:00
committed by GitHub
3 changed files with 8 additions and 4 deletions

View File

@@ -83,6 +83,10 @@ Changes in this release include the following:
wx.msw.MetafileDC have been moved to the core wx module. So they can now be
accessed as wx.Metafile and wx.MetafileDC.
* Updated the waf tool used by the build to version 2.0.7. This fixes problems
with building for Python 3.7.

View File

@@ -83,8 +83,8 @@ sipMD5 = {
'linux64' : 'b349127a4d46452936e4181d96b12c2d',
}
wafCurrentVersion = '1.7.15-p1'
wafMD5 = 'e44003373c965f4221bbdc4c9b846128'
wafCurrentVersion = '2.0.7'
wafMD5 = '48ac1250bcccd0674cf461937875ce9a'
doxygenCurrentVersion = '1.8.8'
doxygenMD5 = {

View File

@@ -30,7 +30,7 @@ def options(opt):
if isWindows:
opt.load('msvc')
else:
opt.load('compiler_cc compiler_cxx')
opt.load('compiler_c compiler_cxx')
opt.load('python')
opt.add_option('--debug', dest='debug', action='store_true', default=False,
@@ -78,7 +78,7 @@ def configure(conf):
conf.env['MSVC_TARGETS'] = [conf.options.msvc_arch]
conf.load('msvc')
else:
conf.load('compiler_cc compiler_cxx')
conf.load('compiler_c compiler_cxx')
if conf.options.python:
conf.env.PYTHON = conf.options.python