Commit a10d423e authored by kevino@webkit.org's avatar kevino@webkit.org

[wx] Build fixes for Windows after recent changes.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60315 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent eb45f851
2010-05-27 Kevin Ollivier <kevino@theolliviers.com>
[wx] Build fixes for Windows after recent changes.
* wscript:
2010-05-27 Gustavo Noronha Silva <gns@gnome.org>
More build fixage for make dist.
......
......@@ -29,7 +29,7 @@ import commands
from settings import *
jscore_excludes = ['jsc.cpp', 'ucptable.cpp']
jscore_excludes = ['jsc.cpp', 'ucptable.cpp','ProfilerServer.mm']
jscore_excludes.extend(get_excludes(jscore_dir, ['*Brew.cpp', '*CF.cpp', '*Symbian.cpp']))
sources = []
......@@ -55,8 +55,14 @@ def generate_jscore_derived_sources():
olddir = os.getcwd()
os.chdir(derived_sources_dir)
# DerivedSources.make expects Cygwin (i.e. Unix-style) python, so use that instead.
if building_on_win32:
oldpath = os.environ["PATH"]
os.environ["PATH"] = "/usr/bin" + os.pathsep + os.environ["PATH"]
command = 'make -f %s/DerivedSources.make JavaScriptCore=%s BUILT_PRODUCTS_DIR=%s all FEATURE_DEFINES="%s"' % (js_dir, js_dir, js_dir, ' '.join(feature_defines))
os.system(command)
if building_on_win32:
os.environ["PATH"] = oldpath
os.chdir(olddir)
def set_options(opt):
......@@ -86,6 +92,7 @@ def build(bld):
install_path = output_dir)
jscore.find_sources_in_dirs(full_dirs, excludes = jscore_excludes)
obj = bld.new_task_gen(
features = 'cxx cprogram',
......
2010-05-27 Kevin Ollivier <kevino@theolliviers.com>
[wx] Build fixes for Windows after recent changes.
* platform/graphics/wx/FontWx.cpp:
* wscript:
2010-05-27 Chris Fleizach <cfleizach@apple.com>
No review, build fixage.
......
......@@ -35,7 +35,7 @@
#if OS(WINDOWS)
#include "UniscribeController.h"
typedef UniscribeController ComplexTextController
typedef WebCore::UniscribeController ComplexTextController;
#endif
#if OS(DARWIN)
......
......@@ -31,6 +31,8 @@ webcore_sources = {}
if build_port == "wx":
if building_on_win32:
# make sure platform/wx comes after this so we get the right
# FontPlatformData.h
webcore_dirs.extend(['platform/wx/wxcode/win', 'plugins/win'])
webcore_sources['wx-win'] = [
'platform/graphics/win/TransformationMatrixWin.cpp',
......@@ -38,8 +40,8 @@ if build_port == "wx":
# 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/win/SharedTimerWin.cpp',
'platform/win/WebCoreInstanceHandle.cpp',
# Use the Windows plugin architecture
'page/win/PageWin.cpp',
'plugins/win/PluginDataWin.cpp',
'plugins/win/PluginDatabaseWin.cpp',
'plugins/win/PluginMessageThrottlerWin.cpp',
......@@ -124,6 +126,7 @@ def build(bld):
os.path.join(wk_root, 'JavaScriptCore'),
os.path.join(wk_root, 'WebCore'),
'platform/image-decoders',
'platform/win',
'platform/wx/wxcode',
'workers',
]
......
2010-05-27 Kevin Ollivier <kevino@theolliviers.com>
[wx] Build fixes for Windows after recent changes.
* WebView.cpp:
(wxWebView::Create):
* wscript:
2010-05-26 Kevin Ollivier <kevino@theolliviers.com>
Build fix after new client added to Page constructor.
......
......@@ -56,6 +56,9 @@
#include "Settings.h"
#include "SubstituteData.h"
#include "Threading.h"
#if __WXMSW__
#include "WebCoreInstanceHandle.h"
#endif
#include "ChromeClientWx.h"
#include "ContextMenuClientWx.h"
......@@ -319,7 +322,7 @@ bool wxWebView::Create(wxWindow* parent, int id, const wxPoint& position,
// due to a problem with exceptions getting eaten when using the callback
// approach to timers (which wx itself uses).
#if __WXMSW__
WebCore::Page::setInstanceHandle(wxGetInstance());
WebCore::setInstanceHandle(wxGetInstance());
#endif
// this helps reduce flicker on platforms like MSW
......
......@@ -40,6 +40,9 @@ include_paths = webkit_dirs + common_includes + ['.', '..',
os.path.join(wk_root, 'WebCore', 'platform', 'graphics', 'wx'),
]
if sys.platform.startswith("win"):
include_paths.append(os.path.join(wk_root, 'WebCore','platform','win'))
windows_deps = [
'lib/pthreadVC2.dll',
'bin/icuuc40.dll', 'bin/icudt40.dll', 'bin/icuin40.dll',
......
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