1 files changed, 48 insertions, 6 deletions
diff --git a/WebKitTools/wx/build/wxpresets.py b/WebKitTools/wx/build/wxpresets.py
index 677720c..3d6b693 100644
--- a/WebKitTools/wx/build/wxpresets.py
+++ b/WebKitTools/wx/build/wxpresets.py
@@ -24,6 +24,37 @@
 # Library for functions to determine wx settings based on configuration
 
 import os
+import re
+
+import Options
+
+def parse_build_cfg(filename):
+    cfg_file = open(filename, 'r')
+    cfg = {}
+    for cfg_line in cfg_file.readlines():
+        key = None
+        value = None
+        parts = cfg_line.split('=')
+        if len(parts) >= 1:
+            key = parts[0].strip()
+        
+        if len(parts) >= 2:
+            value = parts[1].strip()
+            if value.isdigit():
+                value = int(value)
+        
+        if key:
+            cfg[key] = value
+
+    return cfg
+
+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,11 +71,13 @@ 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')
+        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')
@@ -59,18 +92,27 @@ def get_wxmsw_settings(wx_root, shared = False, unicode = False, debug = False,
         depext += 'd'
 
     configdir = os.path.join(libdir, 'msw' + ext)
+    
+    monolithic = False 
+    cfg_file = os.path.join(configdir, 'build.cfg')
+    if os.path.exists(cfg_file):
+        cfg = parse_build_cfg(cfg_file)
+        if "MONOLITHIC" in cfg:
+            monolithic = cfg["MONOLITHIC"]
     libpaths.append(libdir)
     includes.append(configdir)
     
     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')])
+    if monolithic:
+        libs.extend(["wxmsw%s%s" % (version_str_nodot, ext)])
+    else:
+        libs.extend([get_wxlib_name('base'), get_wxlib_name('core')])
     
     if wxPython or debug:
         defines.append('__WXDEBUG__')