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>
This commit is contained in:
Oliver Wolff 2013-12-12 10:15:16 +01:00 committed by The Qt Project
parent a2666d3391
commit 72ea1d5992
6 changed files with 4 additions and 1 deletions

View File

@ -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)

View File

@ -2,6 +2,9 @@ TEMPLATE = lib
TARGET = $$qtLibraryTarget(d3dcompiler_qt)
DLLDESTDIR = $$QT_BUILD_TREE/bin
include(../config.pri)
CONFIG += qt
QT = core
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
SOURCES += main.cpp

View File

@ -1,3 +1,4 @@
TEMPLATE = subdirs
SUBDIRS += compiler libGLESv2 libEGL
angle_d3d11: SUBDIRS += d3dcompiler
CONFIG += ordered