wxPython build fix, the SWIG defines must also be available when compiling.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@47124 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 455aebd7b2813b7d3609c5f772095aaab768f017..f1128e42672dd00afa85c7e21ba6ad6b93a3838b 100644 (file)
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-12  Kevin Ollivier  <kevino@theolliviers.com>
+
+        wxPython build fix, the SWIG defines must also be available when compiling.
+
+        * bindings/python/wscript:
+
 2009-08-05  Kevin Ollivier  <kevino@theolliviers.com>
 
         Reviewed by Eric Seidel.

diff --git a/WebKit/wx/bindings/python/wscript b/WebKit/wx/bindings/python/wscript
index f9d73c3366cd9cbf16a7861dba06eac111b2a924..904e68ebb081671a21f7c063644be23e91b9aa36 100644 (file)
--- a/WebKit/wx/bindings/python/wscript
+++ b/WebKit/wx/bindings/python/wscript
@@ -61,7 +61,11 @@ def configure(conf):
     
 def build(bld):
     if Options.options.wxpython:
-        wx_swig_args = ['-DSWIG_TYPE_TABLE=_wxPython_table', '-DWXP_USE_THREAD=1', '-DSWIG_PYTHON_OUTPUT_TUPLE']
+        defines = ['SWIG_TYPE_TABLE=_wxPython_table', 'WXP_USE_THREAD=1', 'SWIG_PYTHON_OUTPUT_TUPLE']
+        wx_swig_args = []
+        for define in defines:
+            wx_swig_args.append('-D%s' % define)
+
         try:
             import wx.build.config
             wx_swig_args += wx.build.config.swig_args
@@ -81,6 +85,7 @@ def build(bld):
             includes = ' '.join(include_paths),
             source = 'webview.i',
             swig_flags = ' '.join(wx_swig_args),
+            defines = defines,
             target = '_webview',
             uselib = 'WX CURL ICU XSLT XML SQLITE3 WXWEBKIT ' + waf_configname,