Title: [101835] trunk
- Revision
- 101835
- Author
- [email protected]
- Date
- 2011-12-02 11:16:46 -0800 (Fri, 02 Dec 2011)
Log Message
[wx] Unreviewed build fixes for Windows build.
Modified Paths
Diff
Modified: trunk/ChangeLog (101834 => 101835)
--- trunk/ChangeLog 2011-12-02 19:10:30 UTC (rev 101834)
+++ trunk/ChangeLog 2011-12-02 19:16:46 UTC (rev 101835)
@@ -1,3 +1,9 @@
+2011-12-02 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fixes for Windows build.
+
+ * wscript:
+
2011-12-02 Alejandro G. Castro <[email protected]>
[GTK] Fix TextureMapperCairo compilation
Modified: trunk/Source/WebKit/wx/ChangeLog (101834 => 101835)
--- trunk/Source/WebKit/wx/ChangeLog 2011-12-02 19:10:30 UTC (rev 101834)
+++ trunk/Source/WebKit/wx/ChangeLog 2011-12-02 19:16:46 UTC (rev 101835)
@@ -1,3 +1,9 @@
+2011-12-02 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fixes for Windows build.
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+
2011-11-30 Alexey Proskuryakov <[email protected]>
Remove an unneeded argument from FrameLoaderClient::download
Modified: trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp (101834 => 101835)
--- trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp 2011-12-02 19:10:30 UTC (rev 101834)
+++ trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp 2011-12-02 19:16:46 UTC (rev 101835)
@@ -50,6 +50,10 @@
#include "ResourceError.h"
#include "ResourceResponse.h"
#include "ScriptController.h"
+#if OS(WINDOWS)
+#include "SystemInfo.h"
+#endif
+
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
Modified: trunk/Tools/ChangeLog (101834 => 101835)
--- trunk/Tools/ChangeLog 2011-12-02 19:10:30 UTC (rev 101834)
+++ trunk/Tools/ChangeLog 2011-12-02 19:16:46 UTC (rev 101835)
@@ -1,3 +1,9 @@
+2011-12-02 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fixes for Windows build.
+
+ * waf/build/wxpresets.py:
+
2011-12-01 Eric Seidel <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Tools/waf/build/wxpresets.py (101834 => 101835)
--- trunk/Tools/waf/build/wxpresets.py 2011-12-02 19:10:30 UTC (rev 101834)
+++ trunk/Tools/waf/build/wxpresets.py 2011-12-02 19:16:46 UTC (rev 101835)
@@ -95,7 +95,7 @@
if wxPython and not version_str_nodot.startswith('29'):
ext += 'h'
depext += 'h'
- elif debug and not version_str_nodot.startswith('29'):
+ elif debug:
ext += 'd'
depext += 'd'
Modified: trunk/wscript (101834 => 101835)
--- trunk/wscript 2011-12-02 19:10:30 UTC (rev 101834)
+++ trunk/wscript 2011-12-02 19:16:46 UTC (rev 101835)
@@ -53,6 +53,7 @@
os.system('make -f %s/DerivedSources.make WebCore=%s SOURCE_ROOT=%s all FEATURE_DEFINES="%s"' % (wc_dir, wc_dir, wc_dir, conf.env["FEATURE_DEFINES"]))
if building_on_win32:
os.environ["PATH"] = oldpath
+ os.system('perl %s/Source/WebKit/scripts/generate-webkitversion.pl --outputDir=%s --config %s/Source/WebKit/mac/Configurations/Version.xcconfig' % (wk_root, derived_sources_dir, wk_root))
os.chdir(olddir)
def generate_jscore_derived_sources(conf):
@@ -162,6 +163,7 @@
# 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).
'Source/WebCore/platform/win/SharedTimerWin.cpp',
+ 'Source/WebCore/platform/win/SystemInfo.cpp',
'Source/WebCore/platform/win/WebCoreInstanceHandle.cpp',
# Use the Windows plugin architecture
#'Source/WebCore/plugins/win/PluginDataWin.cpp',
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
