Bug 119161 - Windows WebGL build needs more include directories
Summary: Windows WebGL build needs more include directories
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebGL (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Windows 7
: P2 Trivial
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-07-26 14:08 PDT by Alex Christensen
Modified: 2013-07-30 09:31 PDT (History)
2 users (show)

See Also:


Attachments
Patch (7.32 KB, patch)
2013-07-26 14:10 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (7.32 KB, patch)
2013-07-30 01:00 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alex Christensen 2013-07-26 14:08:50 PDT
The following directories have files that need to be included to build WebGL on Windows:

Source\WebCore\platform\graphics\gpu
Source\WebCore\platform\graphics\cairo
Source\WebCore\platform\graphics\egl
Source\WebCore\platform\graphics\surfaces\egl
Source\WebCore\platform\graphics\opengl
Comment 1 Alex Christensen 2013-07-26 14:10:34 PDT
Created attachment 207553 [details]
Patch
Comment 2 Brent Fulgham 2013-07-26 14:54:07 PDT
Comment on attachment 207553 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=207553&action=review

You snuck a Cairo header path into the common build.  This might cause errors when building for Apple Windows.  Can you please move that one include to the WebCoreCairo.props file?  The other Cairo paths are already there -- looks like I missed that one.

> Source/WebCore/WebCore.vcxproj/WebCoreCommon.props:10
> +      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Modules\filesystem;$(ProjectDir)..\Modules\geolocation;$(ProjectDir)..\Modules\indexeddb;$(ProjectDir)..\Modules\mediasource;$(ProjectDir)..\Modules\navigatorcontentutils;$(ProjectDir)..\Modules\speech;$(ProjectDir)..\Modules\proximity;$(ProjectDir)..\Modules\quota;$(ProjectDir)..\Modules\notifications;$(ProjectDir)..\Modules\webdatabase;$(ProjectDir)..\Modules\websockets;$(ProjectDir)..\accessibility;$(ProjectDir)..\accessibility\win;$(ProjectDir)..\bridge;$(ProjectDir)..\bridge\c;$(ProjectDir)..\bridge\jsc;$(ProjectDir)..\css;$(ProjectDir)..\editing;$(ProjectDir)..\fileapi;$(ProjectDir)..\rendering;$(ProjectDir)..\rendering\mathml;$(ProjectDir)..\rendering\style;$(ProjectDir)..\rendering\svg;$(ProjectDir)..\bindings;$(ProjectDir)..\bindings\generic;$(ProjectDir)..\bindings\js;$(ProjectDir)..\bindings\js\specialization;$(ProjectDir)..\dom;$(ProjectDir)..\dom\default;$(ProjectDir)..\history;$(ProjectDir)..\html;$(ProjectDir)..\html\canvas;$(ProjectDir)..\html\forms;$(ProjectDir)..\html\parser;$(ProjectDir)..\html\shadow;$(ProjectDir)..\html\track;$(ProjectDir)..\inspector;$(ProjectDir)..\loader;$(ProjectDir)..\loader\appcache;$(ProjectDir)..\loader\archive;$(ProjectDir)..\loader\archive\cf;$(ProjectDir)..\loader\cache;$(ProjectDir)..\loader\icon;$(ProjectDir)..\mathml;$(ProjectDir)..\page;$(ProjectDir)..\page\animation;$(ProjectDir)..\page\scrolling;$(ProjectDir)..\page\win;$(ProjectDir)..\platform;$(ProjectDir)..\platform\animation;$(ProjectDir)..\platform\mock;$(ProjectDir)..\platform\sql;$(ProjectDir)..\platform\win;$(ProjectDir)..\platform\network;$(ProjectDir)..\platform\network\win;$(ProjectDir)..\platform\cf;$(ProjectDir)..\platform\graphics;$(ProjectDir)..\platform\graphics\ca;$(ProjectDir)..\platform\graphics\cpu\arm\filters;$(ProjectDir)..\platform\graphics\filters;$(ProjectDir)..\platform\graphics\filters\arm;$(ProjectDir)..\platform\graphics\opentype;$(ProjectDir)..\platform\graphics\transforms;$(ProjectDir)..\platform\text;$(ProjectDir)..\platform\text\transcoder;$(ProjectDir)..\platform\graphics\win;$(ProjectDir)..\xml;$(ProjectDir)..\xml\parser;$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources;$(ProjectDir)..\plugins;$(ProjectDir)..\plugins\win;$(ProjectDir)..\svg\animation;$(ProjectDir)..\svg\graphics;$(ProjectDir)..\svg\properties;$(ProjectDir)..\svg\graphics\filters;$(ProjectDir)..\svg;$(ProjectDir)..\testing;$(ProjectDir)..\wml;$(ProjectDir)..\storage;$(ProjectDir)..\websockets;$(ProjectDir)..\workers;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\JavaScriptCore;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ProjectDir)..\ForwardingHeaders;$(ProjectDir)..\platform\graphics\gpu;$(ProjectDir)..\platform\graphics\cairo;$(ProjectDir)..\platform\graphics\egl;$(ProjectDir)..\platform\graphics\surfaces\egl;$(ProjectDir)..\platform\graphics\opengl;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include\private\JavaScriptCore;$(WebKit_Libraries)\include\sqlite;$(WebKit_Libraries)\include\JavaScriptCore;$(WebKit_Libraries)\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

The "$(ProjectDir)..\platform\graphics\cairo" should go in the WebCoreCairo.props file.
Comment 3 Alex Christensen 2013-07-26 18:28:14 PDT
For some reason building the AppleWin port with WebGL included a file from Cairo.  I'll probably just refactor that code and maybe add some #if USE(CAIRO)s around the include.
Comment 4 Alex Christensen 2013-07-30 01:00:47 PDT
Created attachment 207697 [details]
Patch
Comment 5 Alex Christensen 2013-07-30 01:01:48 PDT
Between the patches I've refactored and moved some code around to not need to include anything in the cairo or efl directories.
Comment 6 Brent Fulgham 2013-07-30 09:09:17 PDT
Comment on attachment 207697 [details]
Patch

r=me
Comment 7 WebKit Commit Bot 2013-07-30 09:31:53 PDT
Comment on attachment 207697 [details]
Patch

Clearing flags on attachment: 207697

Committed r153476: <http://trac.webkit.org/changeset/153476>
Comment 8 WebKit Commit Bot 2013-07-30 09:31:56 PDT
All reviewed patches have been landed.  Closing bug.