diff options
Diffstat (limited to 'WebCore/wscript')
| -rw-r--r-- | WebCore/wscript | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/WebCore/wscript b/WebCore/wscript index 19cc392..8aa279c 100644 --- a/WebCore/wscript +++ b/WebCore/wscript @@ -33,10 +33,10 @@ if build_port == "wx": if building_on_win32: webcore_dirs.extend(['platform/wx/wxcode/win', 'plugins/win']) webcore_sources['wx-win'] = [ + 'platform/graphics/win/TransformationMatrixWin.cpp', # wxTimer on Windows has a bug that causes it to eat crashes in callbacks # so we need to use the Win port's implementation until the wx bug fix is # widely available (it was fixed in 2.8.10). - 'platform/graphics/win/TransformationMatrixWin.cpp', 'platform/win/SharedTimerWin.cpp', # Use the Windows plugin architecture 'page/win/PageWin.cpp', @@ -53,6 +53,7 @@ if build_port == "wx": webcore_sources['wx-mac'] = [ 'platform/mac/WebCoreNSStringExtras.mm', 'platform/mac/PurgeableBufferMac.cpp', + 'platform/wx/wxcode/mac/carbon/fontprops.mm', 'plugins/wx/PluginDataWx.cpp', 'plugins/mac/PluginPackageMac.cpp', 'plugins/mac/PluginViewMac.cpp' @@ -90,6 +91,13 @@ def set_options(opt): def configure(conf): common_configure(conf) generate_webcore_derived_sources() + if sys.platform.startswith('win'): + graphics_dir = os.path.join(wk_root, 'WebCore', 'platform', 'graphics') + # HACK ALERT: MSVC automatically adds the source file's directory as the first entry in the + # path. Unfortunately, that means when compiling these files we will end up including + # win/FontPlatformData.h, which breaks wx compilation. So we copy the files to the wx dir. + for afile in ['UniscribeController.h', 'UniscribeController.cpp', 'GlyphPageTreeNodeCairoWin.cpp']: + shutil.copy(os.path.join(graphics_dir, 'win', afile), os.path.join(graphics_dir, 'wx')) def build(bld): import Options @@ -106,9 +114,11 @@ def build(bld): ] features = [build_port] - exclude_patterns = ['*None.cpp', '*CFNet.cpp', '*Qt.cpp', '*Win.cpp', '*Wince.cpp', '*Gtk.cpp', '*Mac.cpp', '*Safari.cpp', '*Chromium*.cpp','*SVG*.cpp', '*AllInOne.cpp', 'test*bindings.*'] + exclude_patterns = ['*None.cpp', '*CFNet.cpp', '*Qt.cpp', '*Wince.cpp', '*Gtk.cpp', '*Mac.cpp', '*Safari.cpp', '*Chromium*.cpp','*SVG*.cpp', '*AllInOne.cpp', 'test*bindings.*'] if build_port == 'wx': features.append('curl') + if not building_on_win32: + exclude_patterns.append('*Win.cpp') if sys.platform.startswith('darwin'): features.append('cf') @@ -126,6 +136,8 @@ def build(bld): wk_includes.append(os.path.join(jscore_dir, 'wtf', 'unicode')) wk_includes.append(os.path.join(jscore_dir, 'wtf', 'unicode', 'icu')) wk_includes += common_includes + full_dirs + if sys.platform.startswith('darwin'): + wk_includes.append(os.path.join(webcore_dir, 'icu')) cxxflags = [] if building_on_win32: @@ -168,6 +180,9 @@ def build(bld): excludes.append('JSInspectorController.cpp') if building_on_win32: excludes.append('SharedTimerWx.cpp') + excludes.append('GlyphMapWx.cpp') + excludes.append('RenderThemeWin.cpp') + excludes.append('KeyEventWin.cpp') excludes.append('AuthenticationCF.cpp') excludes.append('LoaderRunLoopCF.cpp') |