diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebKitTools/wx | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebKitTools/wx')
| -rw-r--r-- | WebKitTools/wx/build/settings.py | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py index baf9657..1498c3d 100644 --- a/WebKitTools/wx/build/settings.py +++ b/WebKitTools/wx/build/settings.py @@ -232,7 +232,11 @@ def common_configure(conf): global msvc_version global msvclibs_dir + libprefix = '' + if building_on_win32: + libprefix = 'lib' + found_versions = conf.get_msvc_versions() if found_versions[0][0] == 'msvc 9.0': msvc_version = 'msvc2008' @@ -268,6 +272,9 @@ def common_configure(conf): conf.env.append_value('CXXDEFINES', ['BUILDING_WX__=1', 'JS_NO_EXPORT']) + conf.env['LIB_WXWEBKIT'] = ['wxwebkit'] + conf.env['CXXDEFINES_WXWEBKIT'] = ['WXUSINGDLL_WEBKIT'] + if building_on_win32: conf.env.append_value('LIBPATH', os.path.join(msvclibs_dir, 'lib')) # wx settings @@ -279,6 +286,9 @@ def common_configure(conf): conf.env['LIB_WX'] = wxlibs conf.env['LIBPATH_WX'] = wxlibpaths + conf.env['LIB_JSCORE'] = [libprefix + 'jscore'] + conf.env['LIB_WEBCORE'] = [libprefix + 'webcore'] + if sys.platform.startswith('darwin'): conf.env['LIB_ICU'] = ['icucore'] # Apple does not ship the ICU headers with Mac OS X, so WebKit includes a copy of 3.2 headers @@ -306,7 +316,12 @@ def common_configure(conf): sdk_version = min_version if min_version == "10.4": sdk_version += "u" - conf.env.append_value('LIB', ['WebKitSystemInterfaceTiger']) + conf.env.append_value('LIB_WEBCORE', ['WebKitSystemInterfaceTiger']) + else: + # NOTE: There is a WebKitSystemInterfaceSnowLeopard, but when we use that + # on 10.6, we get a strange missing symbol error, and this library seems to + # work fine for wx's purposes. + conf.env.append_value('LIB_WEBCORE', ['WebKitSystemInterfaceLeopard']) sdkroot = '/Developer/SDKs/MacOSX%s.sdk' % sdk_version sdkflags = ['-arch', 'i386', '-isysroot', sdkroot] @@ -317,15 +332,6 @@ def common_configure(conf): conf.env.append_value('CPPPATH_SQLITE3', [os.path.join(wklibs_dir, 'WebCoreSQLite3')]) conf.env.append_value('LIB_SQLITE3', ['WebCoreSQLite3']) - libprefix = '' - if building_on_win32: - libprefix = 'lib' - - conf.env['LIB_JSCORE'] = [libprefix + 'jscore'] - conf.env['LIB_WEBCORE'] = [libprefix + 'webcore'] - conf.env['LIB_WXWEBKIT'] = ['wxwebkit'] - conf.env['CXXDEFINES_WXWEBKIT'] = ['WXUSINGDLL_WEBKIT'] - conf.env.append_value('CXXDEFINES', feature_defines) if config == 'Release': conf.env.append_value('CPPDEFINES', 'NDEBUG') |