commit 76597e9b1cf8884971842eed89d7349af1a53d19
author kevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Apr 29 16:57:53 2011 +0000
committer kevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Apr 29 16:57:53 2011 +0000
tree 814c1d7a4e89607fc62a99fa0eaf832250d26497
parent a726e0d7fb4ae1c8019d03929115f06746668cce

[wx] Unreviewed build fixes for recent changes in WebKit trunk and wxMSW.


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

wscript

diff --git a/wscript b/wscript
index e508cbe..c6771f0 100644
--- a/wscript
+++ b/wscript
@@ -28,6 +28,7 @@
 import Options
 
 from settings import *
+import wxpresets
 
 import TaskGen
 from TaskGen import taskgen, feature, after
@@ -335,7 +336,11 @@
             
         if building_on_win32:
             for wxlib in bld.env['LIB_WX']:
+                wx_version = wxpresets.get_wx_version(os.environ['WXWIN'])
+                if int(wx_version[1]) % 2 == 1:
+                    wxlib = wxlib.replace(''.join(wx_version[:2]), ''.join(wx_version))
                 wxlibname = os.path.join(bld.env['LIBPATH_WX'][0], wxlib + '_vc.dll')
+                print "Copying %s" % wxlibname
                 if os.path.exists(wxlibname):
                     bld.install_files(webcore.install_path, [wxlibname])