From e0c0e83fd5534b24f18d5e02a453182df54933e0 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Mon, 15 Oct 2012 14:16:51 +0200 Subject: 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 --- src/3rdparty/angle/.gitignore | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/3rdparty/angle/.gitignore (limited to 'src/3rdparty/angle/.gitignore') diff --git a/src/3rdparty/angle/.gitignore b/src/3rdparty/angle/.gitignore new file mode 100644 index 0000000000..cfa07de1ee --- /dev/null +++ b/src/3rdparty/angle/.gitignore @@ -0,0 +1,35 @@ +# This file is used to ignore files which are generated when building ANGLE +# ---------------------------------------------------------------------------- + +# Directories from ANGLE we don't want/need +build +extensions +samples +tests +third_party +src/ipch +.svn + +# Files from ANGLE we don't want/need +DEPS +*.gyp +*.gypi +*.sh +*.bat +codereview.settings + +# Generated by flex/bison +src/compiler/preprocessor/new/Tokenizer.cpp +src/compiler/preprocessor/new/ExpressionParser.cpp +src/compiler/glslang_lex.cpp +src/compiler/glslang_tab.cpp +src/compiler/glslang_tab.h + +# Generated by FXC +src/libGLESv2/shaders/standardvs.h +src/libGLESv2/shaders/flipyvs.h +src/libGLESv2/shaders/luminanceps.h +src/libGLESv2/shaders/componentmaskps.h +src/libGLESv2/shaders/passthroughps.h + + -- cgit v1.2.3