Commit 83d82d65 authored by kevino@webkit.org's avatar kevino@webkit.org

wx build fix, improve debug support and 2.9 support on MSW.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48422 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2d601bbb
2009-09-16 Kevin Ollivier <kevino@theolliviers.com>
wx build fix, improve debug support and 2.9 support on MSW.
* wx/build/settings.py:
* wx/build/wxpresets.py:
2009-09-16 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Blind try at fixing new test failure on Windows.
......
......@@ -252,7 +252,9 @@ def common_configure(conf):
if building_on_win32:
conf.env.append_value('LIBPATH', os.path.join(msvclibs_dir, 'lib'))
# wx settings
wxdefines, wxincludes, wxlibs, wxlibpaths = get_wxmsw_settings(wx_root, shared=True, unicode=True, wxPython=Options.options.wxpython)
global config
is_debug = (config == 'Debug')
wxdefines, wxincludes, wxlibs, wxlibpaths = get_wxmsw_settings(wx_root, shared=True, unicode=True, debug=is_debug, wxPython=Options.options.wxpython)
conf.env['CXXDEFINES_WX'] = wxdefines
conf.env['CPPPATH_WX'] = wxincludes
conf.env['LIB_WX'] = wxlibs
......
......@@ -24,6 +24,15 @@
# Library for functions to determine wx settings based on configuration
import os
import re
def get_wx_version(wx_root):
versionText = open(os.path.join(wx_root, "include", "wx", "version.h"), "r").read()
majorVersion = re.search("#define\swxMAJOR_VERSION\s+(\d+)", versionText).group(1)
minorVersion = re.search("#define\swxMINOR_VERSION\s+(\d+)", versionText).group(1)
return (majorVersion, minorVersion)
def get_wxmsw_settings(wx_root, shared = False, unicode = False, debug = False, wxPython=False):
if not os.path.exists(wx_root):
......@@ -40,6 +49,8 @@ def get_wxmsw_settings(wx_root, shared = False, unicode = False, debug = False,
ext = ''
postfix = 'vc'
version_str_nodot = ''.join(get_wx_version(wx_root))
if shared:
defines.append('WXUSINGDLL')
libdir = os.path.join(libdir, 'vc_dll')
......@@ -65,9 +76,9 @@ def get_wxmsw_settings(wx_root, shared = False, unicode = False, debug = False,
def get_wxlib_name(name):
prefix = 'wxmsw'
if name == 'base':
return 'wxbase28%s' % (ext)
return 'wxbase%s%s' % (version_str_nodot, ext)
return "wxmsw28%s_%s" % (ext, name)
return "wxmsw%s%s_%s" % (version_str_nodot, ext, name)
libs.extend(['wxzlib' + depext, 'wxjpeg' + depext, 'wxpng' + depext, 'wxexpat' + depext])
libs.extend([get_wxlib_name('base'), get_wxlib_name('core')])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment