[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit f7010fe52662f39d7a940bdc42ba781a88b5fd53
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 20:23:13 2009 +0000

    2009-10-05  Vadim Zeitlin  <vadim at wxwidgets.org>
    
            Added --wx-compiler-prefix waf option to allow building wxWebKit with
            wxWidgets built using "nmake COMPILER_PREFIX=something-non-default".
    
            * wx/build/settings.py:
            * wx/build/wxpresets.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49109 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7055ccd..80e912b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-05  Vadim Zeitlin  <vadim at wxwidgets.org>
+
+        Added --wx-compiler-prefix waf option to allow building wxWebKit with
+        wxWidgets built using "nmake COMPILER_PREFIX=something-non-default".
+
+        * wx/build/settings.py:
+        * wx/build/wxpresets.py:
+
 2009-10-05  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index 44b7632..581c51b 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -201,6 +201,8 @@ def common_set_options(opt):
     opt.tool_options('python')
     
     opt.add_option('--wxpython', action='store_true', default=False, help='Create the wxPython bindings.')
+    opt.add_option('--wx-compiler-prefix', action='store', default='vc',
+                   help='Specify a different compiler prefix (do this if you used COMPILER_PREFIX when building wx itself)')
 
 def common_configure(conf):
     """
diff --git a/WebKitTools/wx/build/wxpresets.py b/WebKitTools/wx/build/wxpresets.py
index 67a02c8..3d6b693 100644
--- a/WebKitTools/wx/build/wxpresets.py
+++ b/WebKitTools/wx/build/wxpresets.py
@@ -26,6 +26,8 @@
 import os
 import re
 
+import Options
+
 def parse_build_cfg(filename):
     cfg_file = open(filename, 'r')
     cfg = {}
@@ -73,9 +75,9 @@ def get_wxmsw_settings(wx_root, shared = False, unicode = False, debug = False,
     
     if shared:
         defines.append('WXUSINGDLL')
-        libdir = os.path.join(libdir, 'vc_dll')
+        libdir = os.path.join(libdir, Options.options.wx_compiler_prefix + '_dll')
     else:
-        libdir = os.path.join(libdir, 'vc_lib')
+        libdir = os.path.join(libdir, Options.options.wx_compiler_prefix + '_lib')
         
     if unicode:
         defines.append('_UNICODE')

-- 
WebKit Debian packaging