From 1690888828838d82adc360288f9a46ae36d02474 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 29 Dec 2013 08:25:39 +0000 Subject: [PATCH] Only build the webkit module on Darwin git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wscript | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/wscript b/wscript index 0721feff..d9f2d01f 100644 --- a/wscript +++ b/wscript @@ -122,9 +122,6 @@ def configure(conf): _copyEnvGroup(conf.env, '_WX', '_WXWEBVIEW') conf.env.LIB_WXWEBVIEW += cfg.makeLibName('webview') - _copyEnvGroup(conf.env, '_WX', '_WXWEBKIT') - conf.env.LIB_WXWEBKIT += cfg.makeLibName('webkit') - _copyEnvGroup(conf.env, '_WX', '_WXXML') conf.env.LIB_WXXML += cfg.makeLibName('xml', isMSWBase=True) @@ -191,9 +188,10 @@ def configure(conf): args='--cxxflags --libs webview,core,net' + rpath, uselib_store='WXWEBVIEW', mandatory=True) - conf.check_cfg(path=conf.options.wx_config, package='', - args='--cxxflags --libs core,net' + rpath, - uselib_store='WXWEBKIT', mandatory=True) + if isDarwin: + conf.check_cfg(path=conf.options.wx_config, package='', + args='--cxxflags --libs core,net' + rpath, + uselib_store='WXWEBKIT', mandatory=True) conf.check_cfg(path=conf.options.wx_config, package='', args='--cxxflags --libs xml,core,net' + rpath, @@ -518,13 +516,14 @@ def build(bld): ) makeExtCopyRule(bld, '_html2') - etg = loadETG('etg/_webkit.py') - bld(features = 'c cxx cxxshlib pyext', - target = makeTargetName(bld, '_webkit'), - source = getEtgSipCppFiles(etg) + rc, - uselib = 'WXWEBKIT WXPY', - ) - makeExtCopyRule(bld, '_webkit') + if isDarwin: + etg = loadETG('etg/_webkit.py') + bld(features = 'c cxx cxxshlib pyext', + target = makeTargetName(bld, '_webkit'), + source = getEtgSipCppFiles(etg) + rc, + uselib = 'WXWEBKIT WXPY', + ) + makeExtCopyRule(bld, '_webkit') etg = loadETG('etg/_xml.py') bld(features = 'c cxx cxxshlib pyext',