[Qt] Fix build with ANGLE on platforms that provide EGL/GLESv2
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Sep 2012 10:55:43 +0000 (10:55 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Sep 2012 10:55:43 +0000 (10:55 +0000)
commit39b1808227cb8a0d9de743762eb7c3c64dc643fc
tree5bf81fc82d0fde7f7da34a79caa1d9d15fa289ea
parent49dfad4df3dfbbeda81c6858bed3d5fa320225e7
[Qt] Fix build with ANGLE on platforms that provide EGL/GLESv2
https://bugs.webkit.org/show_bug.cgi?id=95965

Reviewed by Tor Arne Vestbø.

.:

Add ANGLE as separate static library to the build and dependencies.

* Source/api.pri:
* WebKit.pro:

Source/ThirdParty/ANGLE:

Add build rules to build ANGLE as a static library for the Qt port.

* ANGLE.pri: Added.
* ANGLE.pro: Added.
* DerivedSources.pri: Added.
* Target.pri: Added.

Source/WebCore:

Moved all ANGLE build rules from here to Source/Thirty/ANGLE and
instead depend on the new library with a simple WEBKIT += ANGLE.

* DerivedSources.pri:
* Target.pri:
* platform/graphics/ANGLEWebKitBridge.h: Simplify the include statement
for the internal shader compiler API, aligned with the other platforms.

Source/WebKit:

Depend on ANGLE if necessary, due to the use WebCore types that pull in ANGLE
headers (GraphicsContext3D.h in particular).

* WebKit1.pro:

Source/WebKit2:

Depend on ANGLE if necessary, due to the use WebCore types that pull in ANGLE
headers (GraphicsContext3D.h in particular).

* Target.pri:

Tools:

Add ANGLE as a static library module to the Qt WebKit build system.

* qmake/mkspecs/features/default_post.prf:
* qmake/mkspecs/modules/angle.prf: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@127724 268f45cc-cd09-0410-ab3c-d52691b4dbfc
19 files changed:
ChangeLog
Source/ThirdParty/ANGLE/ANGLE.pri [new file with mode: 0644]
Source/ThirdParty/ANGLE/ANGLE.pro [new file with mode: 0644]
Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/DerivedSources.pri [new file with mode: 0644]
Source/ThirdParty/ANGLE/Target.pri [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.pri
Source/WebCore/Target.pri
Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
Source/WebKit/ChangeLog
Source/WebKit/WebKit1.pro
Source/WebKit2/ChangeLog
Source/WebKit2/Target.pri
Source/api.pri
Tools/ChangeLog
Tools/qmake/mkspecs/features/default_post.prf
Tools/qmake/mkspecs/modules/angle.prf [new file with mode: 0644]
WebKit.pro