summaryrefslogtreecommitdiffstats
path: root/src/angle/src/config.pri
Commit message (Collapse)AuthorAgeFilesLines
* ANGLE: Use rtti_off in CONFIG only for releaseJonathan Liu2013-04-111-1/+2
| | | | | | | | ANGLE uses dynamic_cast in debug.h for debug builds which require RTTI. Change-Id: I0e2fea7ed751dc87624d7e76d179023accb9c126 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Upgrade ANGLE to DX11 ProtoAndrew Knight2013-04-081-0/+5
| | | | | | | | | | | | | | | Upgrades ANGLE to dx11proto (dx11-MRT-support tag), which splits out support for DirectX9 & DirectX11. The DX9 codepath is used by default; CONFIG+=angle_d3d11 must be passed to the ANGLE project to build for DX11. Existing patches to ANGLE have been updated (or removed if no longer needed), and a patch has been added to make DX9/DX11 codepaths mutually exclusive. Change-Id: Ibe13befadb94f04883eca449d0ee1f0da955ff92 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Axel Waggershauser <awagger@gmail.com>
* fix platform conditional for using our gnuwin toolsOswald Buddenhagen2013-02-131-1/+1
| | | | | | | | | it's pointless to test the target platform - it's always windows. but it may make sense to test the host platform (not sure whether it's possible to x-build angle). Change-Id: I57847c930d6108a24a1005aa44f94ba0b4f9dfec Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix angle build under msysOswald Buddenhagen2013-02-131-6/+6
| | | | | | | | use library function which deals with shell specifics to set up PATH Task-number: QTBUG-29427 Change-Id: Ic2bed4d7f0eb072bcce6a9f99be02d3cd08a7c98 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove useless unset()sOswald Buddenhagen2013-02-131-1/+0
| | | | | | | | there is mightily little point in unsetting variables right before unconditionally assigning to them. Change-Id: I24c1814ce38bf9aab4496679b1a670f3cd55c536 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove abuse of eval()Oswald Buddenhagen2013-02-131-2/+2
| | | | | Change-Id: I8fdba2998f9e4d03c37235c377b5db0aadc27608 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* produce shorter/nicer source pathsOswald Buddenhagen2013-02-131-2/+2
| | | | | Change-Id: Ia71410fdc6ee30192239e9c9efa716cfa811c13e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix overquoting of GNUPATHOswald Buddenhagen2013-01-281-1/+2
| | | | | | | Task-number: QTBUG-28841 Change-Id: Ifa62a273acefc240953633bbd099384a635f29c6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* ANGLE: Fix debug-and-release buildsFriedemann Kleint2012-12-011-11/+3
| | | | | | | | | | | | | | | Add a 'd' to debug builds to allow both release and debug builds to be used. - Add .def-files for Debug - Build all libraries debug/release - Add description to README.qt - Differentiate debug/release in qmake.conf. Task-number: QTBUG-28196 Change-Id: Ib3081004a6ed2ad71d353244154684d2e0ebbc86 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Angle: Use dynamic runtime library of MSVC.Friedemann Kleint2012-12-011-4/+11
| | | | | | | | It is also used in Qt, mixing both is not recommended. Add to default variables instead of overwriting them. Change-Id: I895d44d5ea17f98dde9979eea6ff10b98180cc08 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Angle: Fix shadow buildYuchen Deng2012-10-261-1/+1
| | | | | | Change-Id: I4ce4741ba1aa4009bd4984b4fad5a1b407d2cce5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add ANGLE as a 3rdparty library to Qt.Jason Barron2012-10-241-0/+103
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>