diff options
author | Jason Barron <jason.barron@digia.com> | 2012-10-15 14:16:51 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-24 02:29:15 +0200 |
commit | e0c0e83fd5534b24f18d5e02a453182df54933e0 (patch) | |
tree | b0277ef33d668f49a02203de2c99b1cfbaad5291 /src/angle/README.qt | |
parent | 84d09214bc54b4a0cf9860aa27e78ae27bfd69f9 (diff) |
Add ANGLE as a 3rdparty library to Qt.
ANGLE is a component that implements the OpenGL ES 2.0 API on
top of DirectX 9. See the following for more info:
http://code.google.com/p/angleproject/
ANGLE is now the default configuration on Windows. If you
want to use desktop OpenGL, you should build Qt with the
following configure options:
-opengl desktop
To configure Qt to use another OpenGL ES 2 implementation,
you should use:
-opengl es2 -no-angle
Task-number: QTBUG-24207
Change-Id: Iefcbeaa37ed920f431729749ab8333b248fe5134
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/angle/README.qt')
-rw-r--r-- | src/angle/README.qt | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/angle/README.qt b/src/angle/README.qt new file mode 100644 index 0000000000..61023efcd1 --- /dev/null +++ b/src/angle/README.qt @@ -0,0 +1,29 @@ +This is the ANGLE project from: + +http://code.google.com/p/angleproject/ + +The upstream version used here can be found in: + +src/common/version.h + +This copy of the library has been modified with several patches +that can be found in the 'patches' subdirectory. + +Updating ANGLE +------------------------------------------------------------- +To update to a newer version of ANGLE, extract the archive +directly into the 'src/3rdparty/angle' directory. ANGLE contains +a .gitignore file that will overwrite the one in Qt, but this is +not desirable so the ANGLE one should be discarded and the one in +Qt should be kept. If there are new source/header files in ANGLE +(git status -u) then they should be added to the relevant .pro +file before committing. + + +Using a custom ANGLE +------------------------------------------------------------- +Qt supports building a version of ANGLE other than the one that +is contained in the source tree. To get Qt to build a different +copy of ANGLE, you can set the ANGLE_DIR environment variable +to point to the location of the custom ANGLE before building Qt. + |