summaryrefslogtreecommitdiffstats
path: root/src/angle/angle.pro
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@digia.com>2013-12-12 10:15:16 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-12 15:39:46 +0100
commit72ea1d59923ffb8591a8298c2b817940db81b615 (patch)
treee6d61d57e36656a906b45f99ab8a40a1f4e48170 /src/angle/angle.pro
parenta2666d33919807ba6170f55f8e74a71ef8392a4d (diff)
Moved d3dcompiler from src/angle to src/angle/src
Even though it is not really part of the angle implementation, having it in source is more consistent with the rest of Qt and makes browsing the code easier. There was also an issue, that only a debug build was done when calling nmake or jom. While moving the implementation this issue was fixed by including config.pri to d3dcompiler's .pro file. Change-Id: I3e3630865c94adbe1a1f1af2ccfc2bcb046002a8 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/angle/angle.pro')
-rw-r--r--src/angle/angle.pro1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/angle/angle.pro b/src/angle/angle.pro
index a8040428d1..83510698d3 100644
--- a/src/angle/angle.pro
+++ b/src/angle/angle.pro
@@ -1,6 +1,5 @@
TEMPLATE = subdirs
SUBDIRS += src
-angle_d3d11: SUBDIRS += d3dcompiler
# We do it this way instead of letting load(qt_module) handle it for two reasons:
# 1) qt_module_headers assumes the TARGET is the same as the include directory (eg: libGLESv2 != GLES2)