Commit 3e7c4ace authored by bdash's avatar bdash

2006-11-12 Mark Rowe <bdash@webkit.org>

        Reviewed by Mitz.

        Linux/Gdk compilation fixes, and bakefile cleanups.  Based on patches by
        Alp Toker.

        * Projects/gdk/webcore-gdk.bkl:
        * WebCoreSources.bkl:
        * page/PageState.cpp:
        * platform/gdk/ChromeClientGdk.h:
        (WebCore::ChromeClientGdk::ref):
        (WebCore::ChromeClientGdk::deref):
        * platform/gdk/FrameGdk.cpp:
        (WebCore::FrameGdkClientDefault::openURL):
        (WebCore::FrameGdkClientDefault::didReceiveData):
        (WebCore::FrameGdkClientDefault::receivedAllData):
        (WebCore::FrameGdk::FrameGdk):
        (WebCore::FrameGdk::~FrameGdk):
        * platform/gdk/FrameGdk.h:
        * platform/gdk/KeyEventGdk.cpp:
        (WebCore::keyIdentifierForGdkKeyCode):
        * platform/gdk/ScreenClientGdk.h: Removed.
        * platform/gdk/TemporaryLinkStubs.cpp:
        (FrameGdk::canPaste):
        (FrameGdk::originalRequestURL):
        (TextField::TextField):
        * platform/network/gdk/ResourceHandleManager.cpp:
        (WebCore::ResourceHandleManager::downloadTimerCallback):
        (WebCore::ResourceHandleManager::add):
        (WebCore::ResourceHandleManager::cancel):
        * webcore-base.bkl:
2006-11-12  Mark Rowe  <bdash@webkit.org>

        Reviewed by Mitz.

        Clean up of JavaScriptCore bakefiles.

        * JavaScriptCoreSources.bkl:
        * jscore.bkl:
2006-11-12  Mark Rowe  <bdash@webkit.org>

        Reviewed by Mitz.

        Clean up of GdkLauncher bakefile.

        * GdkLauncher/gdklauncher.bkl:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17741 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 58e230ca
2006-11-12 Mark Rowe <bdash@webkit.org>
Reviewed by Mitz.
Clean up of JavaScriptCore bakefiles.
* JavaScriptCoreSources.bkl:
* jscore.bkl:
2006-11-11 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Maciej.
......
<?xml version="1.0" ?>
<makefile>
<set append="1" var="JSCORE_SOURCES_KJS">
DerivedSources/JavaScriptCore/grammar.cpp
kjs/Context.cpp
kjs/DateMath.cpp
kjs/ExecState.cpp
kjs/JSImmediate.cpp
kjs/JSLock.cpp
kjs/JSWrapperObject.cpp
kjs/Parser.cpp
kjs/PropertyNameArray.cpp
kjs/array_object.cpp
kjs/bool_object.cpp
kjs/collector.cpp
kjs/Context.cpp
kjs/DateMath.cpp
kjs/date_object.cpp
kjs/debugger.cpp
kjs/dtoa.cpp
kjs/error_object.cpp
kjs/ExecState.cpp
kjs/fpconst.cpp
kjs/function.cpp
kjs/function_object.cpp
kjs/identifier.cpp
kjs/internal.cpp
kjs/interpreter.cpp
kjs/JSImmediate.cpp
kjs/JSLock.cpp
kjs/JSWrapperObject.cpp
kjs/lexer.cpp
kjs/list.cpp
kjs/lookup.cpp
kjs/math_object.cpp
kjs/nodes2string.cpp
kjs/nodes.cpp
kjs/nodes2string.cpp
kjs/number_object.cpp
kjs/object.cpp
kjs/object_object.cpp
kjs/operations.cpp
kjs/Parser.cpp
kjs/property_map.cpp
kjs/PropertyNameArray.cpp
kjs/property_slot.cpp
kjs/regexp.cpp
kjs/regexp_object.cpp
......@@ -43,17 +42,15 @@
kjs/testkjs.cpp
kjs/ustring.cpp
kjs/value.cpp
</set>
<set append="1" var="JSCORE_SOURCES_WTF">
<set append="1" var="JSCORE_SOURCES_WTF">
wtf/Assertions.cpp
wtf/FastMalloc.cpp
wtf/HashTable.cpp
</set>
<set append="1" var="JSCORE_SOURCES_PCRE">
<set append="1" var="JSCORE_SOURCES_PCRE">
pcre/pcre_compile.c
pcre/pcre_config.c
pcre/pcre_exec.c
......@@ -72,22 +69,19 @@
pcre/pcre_version.c
pcre/pcre_xclass.c
pcre/ucp_findchar.c
</set>
<set append="1" var="JSCORE_SOURCES_BINDINGS">
<set append="1" var="JSCORE_SOURCES_BINDINGS">
bindings/NP_jsobject.cpp
bindings/c/c_class.cpp
bindings/c/c_instance.cpp
bindings/c/c_runtime.cpp
bindings/c/c_utility.cpp
bindings/NP_jsobject.cpp
bindings/npruntime.cpp
bindings/runtime.cpp
bindings/runtime_array.cpp
bindings/runtime_method.cpp
bindings/runtime_object.cpp
bindings/runtime_root.cpp
</set>
</makefile>
......@@ -29,16 +29,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
JavaScriptCore Bakefile project file.
-->
<makefile>
<set var="SRCDIR">.</set>
<!-- Common definitions etc.: -->
<include file="../Bakefiles/presets.bkl"/>
<include file="JavaScriptCoreSources.bkl"/>
<set var="BUILDDIR">obj-$(FORMAT)</set>
<template id="jscore_base" template="icu">
......@@ -47,19 +43,17 @@ JavaScriptCore Bakefile project file.
<dirname>$(SRCDIR)</dirname>
<include>$(SRCDIR)</include>
<include>$(SRCDIR)/DerivedSources/JavaScriptCore</include>
<include>$(SRCDIR)/ForwardingHeaders</include>
<include>$(SRCDIR)/wtf</include>
<include>$(SRCDIR)/kjs</include>
<include>$(SRCDIR)/pcre</include>
<include>$(SRCDIR)/bindings</include>
<include>$(SRCDIR)/bindings/c</include>
<include>$(SRCDIR)/bindings/jni</include>
<include>$(SRCDIR)/DerivedSources/JavaScriptCore</include>
<define>APPLE_CHANGES=1</define>
<include>$(SRCDIR)/bindings</include>
<include>$(SRCDIR)/kjs</include>
<include>$(SRCDIR)/pcre</include>
<include>$(SRCDIR)/wtf</include>
<!-- this GC version requires Mach's thread suspend/resume: -->
<if cond="PLATFORM_MACOSX=='1'">
<if cond="PLATFORM_MACOSX!='1'">
<define>USE_CONSERVATIVE_GC=0</define>
</if>
......@@ -92,7 +86,7 @@ JavaScriptCore Bakefile project file.
</exe>
<action id="DerivedSources">
<is-phony/>
<is-phony />
<command>bash make-generated-sources.sh</command>
</action>
......@@ -104,18 +98,14 @@ JavaScriptCore Bakefile project file.
<cxx-exceptions>off</cxx-exceptions>
<debug-info>on</debug-info>
<sources>
$(JSCORE_SOURCES_WTF)
$(JSCORE_SOURCES_PCRE)
$(JSCORE_SOURCES_KJS)
$(JSCORE_SOURCES_BINDINGS)
$(JSCORE_SOURCES_KJS)
$(JSCORE_SOURCES_PCRE)
$(JSCORE_SOURCES_WTF)
</sources>
<if cond="PLATFORM_WIN32=='1'">
$(JSCORE_SOURCES_WIN)
</if>
<install-to>$(BUILDDIR)</install-to>
</lib>
</makefile>
2006-11-12 Mark Rowe <bdash@webkit.org>
Reviewed by Mitz.
Linux/Gdk compilation fixes, and bakefile cleanups. Based on patches by
Alp Toker.
* Projects/gdk/webcore-gdk.bkl:
* WebCoreSources.bkl:
* page/PageState.cpp:
* platform/gdk/ChromeClientGdk.h:
(WebCore::ChromeClientGdk::ref):
(WebCore::ChromeClientGdk::deref):
* platform/gdk/FrameGdk.cpp:
(WebCore::FrameGdkClientDefault::openURL):
(WebCore::FrameGdkClientDefault::didReceiveData):
(WebCore::FrameGdkClientDefault::receivedAllData):
(WebCore::FrameGdk::FrameGdk):
(WebCore::FrameGdk::~FrameGdk):
* platform/gdk/FrameGdk.h:
* platform/gdk/KeyEventGdk.cpp:
(WebCore::keyIdentifierForGdkKeyCode):
* platform/gdk/ScreenClientGdk.h: Removed.
* platform/gdk/TemporaryLinkStubs.cpp:
(FrameGdk::canPaste):
(FrameGdk::originalRequestURL):
(TextField::TextField):
* platform/network/gdk/ResourceHandleManager.cpp:
(WebCore::ResourceHandleManager::downloadTimerCallback):
(WebCore::ResourceHandleManager::add):
(WebCore::ResourceHandleManager::cancel):
* webcore-base.bkl:
2006-11-11 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
<?xml version="1.0" ?>
<!-- generate GnuMakefile with
bakefile -f gnu gtkwebcore.bkl
consider forcing includes agian
CXX = g++ -I. include config.h
-->
<makefile>
<option name="ENCODINGS_FILE">
<default-value>platform/gdk/gdk-encodings.txt</default-value>
<values>platform/gdk/gdk-encodings.txt</values>
......@@ -18,6 +10,7 @@
<default-value>XPATH_SUPPORT</default-value>
<values>XPATH_SUPPORT,SVG_SUPPORT</values>
</option>
<set var="FEATURE_DEFINES">XPATH_SUPPORT</set>
<set var="ENCODINGS_FILE">$(SRCDIR)/platform/gdk/gdk-encodings.txt</set>
......@@ -25,7 +18,7 @@
<action id=".DerivedSources">
<!-- This causes a full rebuild everytime
<is-phony/>
<is-phony />
-->
<command>bash -c "cd ../..; ./move-js-headers.sh"</command>
<command>
......@@ -39,9 +32,6 @@
<dll id="webcore-gdk" template="webcore_base,freetype,gtk,curl,cairo,sqlite3">
<!-- FIXME: create a debug option and set these accordingly -->
<!-- check for undefined symbols for debugging reasons -->
<!--
<ldflags>W,undefined</ldflags>
-->
<pre-build-target>.DerivedSources</pre-build-target>
<dirname>.</dirname>
......@@ -56,16 +46,13 @@
<define>BUILDING_GDK__</define>
<define>BUILDING_CAIRO__</define>
<include>platform/gdk</include>
<include>platform/cairo</include>
<include>platform/grahpics/cairo</include>
<include>$(SRCDIR)/kcanvas/device/cairo</include>
<define>XPATH_SUPPORT</define>
<!-- gdk build broken with without NDEBUG defined -->
<define>NDEBUG</define>
<sources>
platform/cairo/GraphicsContextCairo.cpp
platform/cairo/ImageCairo.cpp
platform/cairo/ImageSourceCairo.cpp
platform/gdk/CookieJarGdk.cpp
platform/gdk/CursorGdk.cpp
platform/gdk/FontCacheGdk.cpp
......@@ -81,7 +68,6 @@
platform/network/gdk/ResourceHandleManager.cpp
platform/gdk/RenderThemeGdk.cpp
platform/gdk/RenderPopupMenuGdk.cpp
platform/gdk/ScreenGdk.cpp
platform/gdk/ScrollViewGdk.cpp
platform/gdk/SharedTimerLinux.cpp
platform/gdk/SystemTimeLinux.cpp
......@@ -94,7 +80,7 @@
<clean-files>
.DerivedSources
rm -rf $(SRCDIR)/DerivedSources
rm -rf $(SRCDIR)/include/JavaScripCore
rm -rf $(SRCDIR)/include/JavaScriptCore
rm -rf $(SRCDIR)/Projects/gdk/obj-gnu
</clean-files>
<!--HACK block dependencies on the phony target -->
......
This diff is collapsed.
......@@ -31,7 +31,9 @@
#include "FrameLoader.h"
#include "FrameView.h"
#include "Page.h"
#ifdef SVG_SUPPORT
#include "SVGDocumentExtensions.h"
#endif
#include "kjs_proxy.h"
#include "kjs_window.h"
#include "kjs_window.h"
......
......@@ -28,7 +28,7 @@
namespace WebCore {
class ChromeClientGdk : public ChromeClient {
class ChromeClientGdk : public ChromeClient, public Shared<ChromeClientGdk> {
public:
virtual ~ChromeClientGdk() { }
......@@ -39,6 +39,9 @@ namespace WebCore {
virtual float scaleFactor();
virtual void ref() { Shared<ChromeClientGdk>::ref(); }
virtual void deref() { Shared<ChromeClientGdk>::deref(); }
virtual void focus();
virtual void unfocus();
......
......@@ -27,36 +27,38 @@
#include "config.h"
#include "FrameGdk.h"
#include "ChromeClientGdk.h"
#include "Document.h"
#include "DOMImplementation.h"
#include "DOMWindow.h"
#include "Document.h"
#include "EditorClient.h"
#include "Element.h"
#include "FrameView.h"
#include "FrameLoadRequest.h"
#include "FrameLoader.h"
#include "FramePrivate.h"
#include <gdk/gdk.h>
#include "FrameView.h"
#include "GraphicsContext.h"
#include "HitTestResult.h"
#include "HitTestRequest.h"
#include "HTMLDocument.h"
#include "HitTestRequest.h"
#include "HitTestResult.h"
#include "KeyboardCodes.h"
#include "MouseEventWithHitTestResults.h"
#include "Page.h"
#include "PlatformMouseEvent.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
#include "PlatformWheelEvent.h"
#include "Plugin.h"
#include "RenderLayer.h"
#include "RenderObject.h"
#include "RenderWidget.h"
#include "RenderLayer.h"
#include "ResourceHandle.h"
#include "ResourceHandleInternal.h"
#include "ScreenClientGdk.h"
#include "SSLKeyGenerator.h"
#include "SelectionController.h"
#include "Settings.h"
#include "SSLKeyGenerator.h"
#include "TypingCommand.h"
#include <gdk/gdk.h>
// This function loads resources from WebKit
// This does not belong here and I'm not sure where
......@@ -91,7 +93,7 @@ void FrameGdkClientDefault::setFrame(const FrameGdk* frame)
void FrameGdkClientDefault::openURL(const KURL& url)
{
m_frame->didOpenURL(url);
m_frame->loader()->didOpenURL(url);
m_beginCalled = false;
ResourceRequest request(url);
......@@ -128,15 +130,15 @@ void FrameGdkClientDefault::didReceiveData(ResourceHandle* job, const char* data
m_frame->setResourceRequest(request);
}
#endif
m_frame->begin(job->url());
m_frame->loader()->begin(job->url());
}
m_frame->write(data, length);
m_frame->loader()->write(data, length);
}
void FrameGdkClientDefault::receivedAllData(ResourceHandle* job, PlatformData data)
{
m_frame->end();
m_frame->loader()->end();
m_beginCalled = false;
}
......@@ -159,7 +161,7 @@ static void doScroll(const RenderObject* r, float deltaX, float deltaY)
}
FrameGdk::FrameGdk(GdkDrawable* gdkdrawable)
: Frame(new Page(new ChromeClientGdk(), new ScreenClientGdk()), 0, 0), m_drawable(gdkdrawable)
: Frame(new Page(new ChromeClientGdk()), 0, 0), m_drawable(gdkdrawable)
{
Settings* settings = new Settings;
settings->setAutoLoadImages(true);
......@@ -196,24 +198,9 @@ FrameGdk::FrameGdk(Page* page, Element* element, PassRefPtr<EditorClient> editor
FrameGdk::~FrameGdk()
{
cancelAndClear();
loader()->cancelAndClear();
}
void FrameGdk::submitForm(const FrameLoadRequest& frameLoadRequest, Event*)
{
ResourceRequest request = frameLoadRequest.resourceRequest();
// FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame
if (d->m_submittedFormURL == request.url())
return;
d->m_submittedFormURL = request.url();
if (client())
client()->submitForm(request.httpMethod(), request.url(), &request.httpBody());
clearRecordedFormValues();
}
void FrameGdk::urlSelected(const FrameLoadRequest& frameLoadRequest, Event*)
{
......
......@@ -29,15 +29,15 @@
#define FrameGdk_H_
#include "Frame.h"
#include "ResourceHandleClient.h"
#include "EditorClient.h"
#include "ResourceHandleClient.h"
#include <gdk/gdk.h>
namespace WebCore {
class Element;
class FrameGdk;
class EditorClient;
class FormData;
class FrameGdkClient {
public:
......@@ -85,9 +85,6 @@ public:
virtual void setTitle(const String&);
virtual ObjectContentType objectContentType(const KURL&, const String& mimeType);
virtual Plugin* createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&);
virtual void scheduleClose();
virtual void unfocusWindow();
......
......@@ -132,7 +132,7 @@ static String keyIdentifierForGdkKeyCode(guint keyCode)
case GDK_Delete:
return "U+00007F";
default:
return String::sprintf("U+%06X", toupper(keyCode));
return String::format("U+%06X", toupper(keyCode));
}
}
......
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef ScreenClientGdk_h
#define ScreenClientGdk_h
#include "ScreenClient.h"
namespace WebCore {
class ScreenClientGdk : public ScreenClient {
virtual ~ScreenClientGdk() { }
virtual int depth();
virtual int depthPerComponent();
virtual bool isMonochrome();
virtual FloatRect rect();
virtual FloatRect usableRect();
};
}
#endif // ScreenClientGdk_h
......@@ -161,12 +161,10 @@ bool FrameGdk::statusbarVisible() { notImplemented(); return 0; }
bool FrameGdk::toolbarVisible() { notImplemented(); return 0; }
void FrameGdk::issueTransposeCommand() { notImplemented(); }
bool FrameGdk::canPaste() const { notImplemented(); return 0; }
enum WebCore::ObjectContentType FrameGdk::objectContentType(KURL const&, String const&) { notImplemented(); return (ObjectContentType)0; }
bool FrameGdk::canGoBackOrForward(int) const { notImplemented(); return 0; }
void FrameGdk::issuePasteAndMatchStyleCommand() { notImplemented(); }
bool FrameGdk::isLoadTypeReload() { notImplemented(); return false; }
KURL FrameGdk::originalRequestURL() const { return KURL(); }
Plugin* FrameGdk::createPlugin(Element*, KURL const&, const Vector<String>&, const Vector<String>&, String const&) { notImplemented(); return 0; }
void FrameGdk::goBackOrForward(int distance) { notImplemented(); }
int FrameGdk::getHistoryLength() {notImplemented(); return 0; }
......@@ -305,7 +303,7 @@ void Path::addRect(const FloatRect&) { }
void Path::addEllipse(const FloatRect&) { }
void Path::transform(const AffineTransform& transform) {}
TextField::TextField(TextField::Type) { }
TextField::TextField() { }
TextField::~TextField() { }
void TextField::setFont(WebCore::Font const&) { }
void TextField::setAlignment(HorizontalAlignment) { }
......@@ -362,8 +360,6 @@ Icon::~Icon() { notImplemented(); }
PassRefPtr<Icon> Icon::newIconForFile(const String& filename) { notImplemented(); return PassRefPtr<Icon>(new Icon()); }
void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); }
void IconLoader::notifyIconChanged(const KURL&) { notImplemented(); }
FloatRect Font::selectionRectForComplexText(const TextRun&, const TextStyle&, const IntPoint&, int) const { return FloatRect(); }
void Font::drawComplexText(GraphicsContext*, const TextRun&, const TextStyle&, const FloatPoint&) const { notImplemented(); }
float Font::floatWidthForComplexText(const TextRun&, const TextStyle&) const { notImplemented(); return 0; }
......
......@@ -147,7 +147,7 @@ void ResourceHandleManager::downloadTimerCallback(Timer<ResourceHandleManager>*
}
default:
printf("Curl ERROR %s\n", curl_easy_strerror(msg->data.result));
job->setError(msg->data.result);
// FIXME: report an error?
remove(job);
break;
}
......@@ -209,7 +209,7 @@ void ResourceHandleManager::add(ResourceHandle* job)
// timeout will occur and do curl_multi_perform
if (ret && ret != CURLM_CALL_MULTI_PERFORM) {
printf("Error %d starting job %s\n", ret, job->url().url().ascii());
job->setError(1);
// FIXME: report an error?
startTimer =false;
} else
jobs->add(job);
......@@ -221,7 +221,7 @@ void ResourceHandleManager::add(ResourceHandle* job)
void ResourceHandleManager::cancel(ResourceHandle* job)
{
remove(job);
job->setError(1);
// FIXME: report an error?
}
} // namespace WebCore
......@@ -30,45 +30,38 @@ Base settings shared by all Bakefile-based ports.
-->
<makefile>
<!-- Common definitions etc.: -->
<set var="SRCDIR" append="0">../..</set>
<include file="../Bakefiles/presets.bkl"/>
<include file="WebCoreSources.bkl"/>
<include file="../Bakefiles/presets.bkl" />
<include file="WebCoreSources.bkl" />
<set var="WEBCORE_BASE_SOURCES">
$(WEBCORE_SOURCES_DERIVEDSOURCES)
$(WEBCORE_SOURCES_KHTML)
$(WEBCORE_SOURCES_MISC)
$(WEBCORE_SOURCES_PAGE)
$(WEBCORE_SOURCES_LOADER)
$(WEBCORE_SOURCES_PLATFORM)
$(WEBCORE_SOURCES_IMAGE-DECODERS)
$(WEBCORE_SOURCES_BMP)
$(WEBCORE_SOURCES_GIF)
$(WEBCORE_SOURCES_ICO)
$(WEBCORE_SOURCES_PNG)
$(WEBCORE_SOURCES_XBM)
$(WEBCORE_SOURCES_ZLIB)
$(WEBCORE_SOURCES_JPEG)
$(WEBCORE_SOURCES_CSS)
$(WEBCORE_SOURCES_RENDERING)
$(WEBCORE_SOURCES_XML)
$(WEBCORE_SOURCES_DERIVEDSOURCES)
$(WEBCORE_SOURCES_DOM)
$(WEBCORE_SOURCES_BRIDGE)
$(WEBCORE_SOURCES_EDITING)
$(WEBCORE_SOURCES_GIF)
$(WEBCORE_SOURCES_HTML)
$(WEBCORE_SOURCES_BINDINGS)
$(WEBCORE_SOURCES_ICO)
$(WEBCORE_SOURCES_ICON)
$(WEBCORE_SOURCES_JPEG)
$(WEBCORE_SOURCES_JS)
$(WEBCORE_SOURCES_LOADER)
$(WEBCORE_SOURCES_PAGE)
$(WEBCORE_SOURCES_PLATFORM)
$(WEBCORE_SOURCES_PNG)
$(WEBCORE_SOURCES_RENDERING)
$(WEBCORE_SOURCES_XBM)
$(WEBCORE_SOURCES_XML)
$(WEBCORE_SOURCES_ZLIB)
</set>
<set var="BUILDDIR">obj-$(FORMAT)</set>
<template id="webcore_cairo">
<include>$(SRCDIR)/platform/cairo/cairo/src</include>
<include>$(SRCDIR)/platform/cairo/pixman/src</include>
<include>$(SRCDIR)/platform/graphics/cairo/cairo/src</include>
<include>$(SRCDIR)/platform/graphics/cairo/pixman/src</include>
<sources>
$(WEBCORE_SOURCES_CAIRO)
$(WEBCORE_SOURCES_PIXMAN)
......@@ -76,43 +69,42 @@ Base settings shared by all Bakefile-based ports.
</template>
<template id="webcore_base" template="xml2,iconv,xslt,icu,jscore">
<include>$(SRCDIR)/.</include>
<include>$(SRCDIR)/include</include>
<include>$(SRCDIR)</include>
<include>$(SRCDIR)/DerivedSources/WebCore</include>
<include>$(SRCDIR)/bindings/js</include>
<include>$(SRCDIR)/bridge</include>
<include>$(SRCDIR)/editing</include>
<include>$(SRCDIR)/html</include>
<include>$(SRCDIR)/css</include>
<include>$(SRCDIR)/dom</include>
<include>$(SRCDIR)/loader</include>
<include>$(SRCDIR)/editing</include>
<include>$(SRCDIR)/html</include>
<include>$(SRCDIR)/include</include>
<include>$(SRCDIR)/kcanvas/device</include>
<include>$(SRCDIR)/kcanvas</include>
<include>$(SRCDIR)/loader/icon</include>
<include>$(SRCDIR)/loader</include>
<include>$(SRCDIR)/page</include>
<include>$(SRCDIR)/platform</include>
<include>$(SRCDIR)/platform/image-decoders</include>
<include>$(SRCDIR)/platform/graphics</include>
<include>$(SRCDIR)/platform/image-decoders/bmp</include>
<include>$(SRCDIR)/platform/image-decoders/gif</include>
<include>$(SRCDIR)/platform/image-decoders/ico</include>
<include>$(SRCDIR)/platform/image-decoders/jpeg</include>
<include>$(SRCDIR)/platform/image-decoders/xbm</include>
<include>$(SRCDIR)/platform/image-decoders/png</include>
<include>$(SRCDIR)/platform/image-decoders/xbm</include>
<include>$(SRCDIR)/platform/image-decoders/zlib</include>
<include>$(SRCDIR)/platform/netowrk</include>
<include>$(SRCDIR)/platform/image-decoders</include>
<include>$(SRCDIR)/platform/network</include>
<include>$(SRCDIR)/platform</include>
<include>$(SRCDIR)/rendering</include>
<include>$(SRCDIR)/xml</include>
<include>$(SRCDIR)/kcanvas</include>
<include>$(SRCDIR)/kcanvas/device</include>
<sources>$(WEBCORE_BASE_SOURCES)</sources>
<!-- HACK ALERT! FIX THESE LATER!! -->
<!-- FIXME: when building on Mac, ExtraCFEncodings.h is needed -->
<if cond="PLATFORM_MACOSX=='1'">
<include>$(SRCDIR)/platform/mac</include> <!-- when building on Mac, ExtraCFEncodings.h is needed -->
<include>$(SRCDIR)/platform/mac</include>
</if>
<!-- END HACKS -->
<define>APPLE_CHANGES=1</define>
<define>XSLT_SUPPORT=1</define>
<!-- TODO: is there a Linux-specific platform define? -->
......@@ -121,6 +113,7 @@ Base settings shared by all Bakefile-based ports.
<define>LINUX</define>
</if>
</if>
<!-- this GC version requires Mach's thread suspend/resume: -->
<if cond="PLATFORM_MACOSX!='1'">