+2007-11-20 Kevin Ollivier <kevino@theolliviers.com>
+
+ wx build fix for Windows. Don't use WebCore/move-js-headers.sh as
+ it indiscriminately copies any headers inside JavaScriptCore,
+ which includes Tiger ICU headers.
+
+ * webcore-base.bkl:
+ Remove references to the WebCore/include dir generated by
+ move-js-headers.sh, and also get headers from JavaScriptCore
+ directly rather than from WebCore/ForwardingHeaders.
+
2007-11-20 Alp Toker <alp@atoker.com>
Reviewed by Mark Rowe.
<include>$(SRCDIR)/DerivedSources/WebCore</include>
<include>$(SRCDIR)/dom</include>
<include>$(SRCDIR)/editing</include>
- <include>$(SRCDIR)/ForwardingHeaders/kjs</include>
<include>$(SRCDIR)/history</include>
<include>$(SRCDIR)/html</include>
- <include>$(SRCDIR)/ForwardingHeaders/wtf</include>
- <include>$(SRCDIR)/ForwardingHeaders/kjs</include>
- <include>$(SRCDIR)/ForwardingHeaders/bindings</include>
- <include>$(SRCDIR)/ForwardingHeaders/pcre</include>
- <include>$(SRCDIR)/include</include>
<include>$(SRCDIR)/loader</include>
<include>$(SRCDIR)/loader/gdk</include>
<include>$(SRCDIR)/loader/icon</include>
+2007-11-20 Kevin Ollivier <kevino@theolliviers.com>
+
+ wx build fix for Windows. Don't use WebCore/move-js-headers.sh as
+ it indiscriminately copies any headers inside JavaScriptCore,
+ which includes Tiger ICU headers.
+
+ * presets/wxwebkit.bkl:
+ Remove WebCore/include reference and add JSCore header dirs needed
+ instead.
+
2007-11-19 Kevin Ollivier <kevino@theolliviers.com>
Add pcre directory to JSCore includes, and update the wx port
<template id="jscore">
<include>$(WK_ROOT)</include>
<include>$(WK_ROOT)/JavaScriptCore</include>
+ <include>$(WK_ROOT)/JavaScriptCore/bindings</include>
+ <include>$(WK_ROOT)/JavaScriptCore/ForwardingHeaders</include>
<include>$(WK_ROOT)/JavaScriptCore/kjs</include>
<include>$(WK_ROOT)/JavaScriptCore/pcre</include>
<include>$(WK_ROOT)/JavaScriptCore/wtf</include>
<define>HAVE_FUNC__FINITE=1</define>
</if>
- <include>$(WK_ROOT)/WebCore/.</include>
- <include>$(WK_ROOT)/WebCore/include</include>
+ <include>$(WK_ROOT)/WebCore</include>
<include>$(WK_ROOT)/WebCore/DerivedSources/WebCore</include>
<include>$(WK_ROOT)/WebCore/bindings/js</include>
<include>$(WK_ROOT)/WebCore/bridge</include>
+2007-11-20 Kevin Ollivier <kevino@theolliviers.com>
+
+ wx build fix for Windows. Don't use WebCore/move-js-headers.sh as
+ it indiscriminately copies any headers inside JavaScriptCore,
+ which includes Tiger ICU headers.
+
+ * wx/build-wxwebkit:
+ Don't run WebCore/move-js-headers.sh any longer.
+
2007-11-20 Adam Treat <treat@kde.org>
Reviewed by David Kilzer.
fi
cd $WK_ROOT/WebCore
- ./move-js-headers.sh
- if [ $? != 0 ]; then
- exit $?
- fi
./make-generated-sources.sh platform/wx/wx-encodings.txt
if [ $? != 0 ]; then
exit $?