diff options
Diffstat (limited to 'src/angle')
-rw-r--r-- | src/angle/angle.pro | 1 | ||||
-rw-r--r-- | src/angle/src/d3dcompiler/d3dcompiler.pro (renamed from src/angle/d3dcompiler/d3dcompiler.pro) | 3 | ||||
-rw-r--r-- | src/angle/src/d3dcompiler/d3dcompiler_qt.def (renamed from src/angle/d3dcompiler/d3dcompiler_qt.def) | 0 | ||||
-rw-r--r-- | src/angle/src/d3dcompiler/d3dcompiler_qtd.def (renamed from src/angle/d3dcompiler/d3dcompiler_qtd.def) | 0 | ||||
-rw-r--r-- | src/angle/src/d3dcompiler/main.cpp (renamed from src/angle/d3dcompiler/main.cpp) | 0 | ||||
-rw-r--r-- | src/angle/src/src.pro | 1 |
6 files changed, 4 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) diff --git a/src/angle/d3dcompiler/d3dcompiler.pro b/src/angle/src/d3dcompiler/d3dcompiler.pro index 35b9be2025..0ee3d1f72d 100644 --- a/src/angle/d3dcompiler/d3dcompiler.pro +++ b/src/angle/src/d3dcompiler/d3dcompiler.pro @@ -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 diff --git a/src/angle/d3dcompiler/d3dcompiler_qt.def b/src/angle/src/d3dcompiler/d3dcompiler_qt.def index 0b8679c8e0..0b8679c8e0 100644 --- a/src/angle/d3dcompiler/d3dcompiler_qt.def +++ b/src/angle/src/d3dcompiler/d3dcompiler_qt.def diff --git a/src/angle/d3dcompiler/d3dcompiler_qtd.def b/src/angle/src/d3dcompiler/d3dcompiler_qtd.def index 0bdd0a1ffd..0bdd0a1ffd 100644 --- a/src/angle/d3dcompiler/d3dcompiler_qtd.def +++ b/src/angle/src/d3dcompiler/d3dcompiler_qtd.def diff --git a/src/angle/d3dcompiler/main.cpp b/src/angle/src/d3dcompiler/main.cpp index 96d71d5e0d..96d71d5e0d 100644 --- a/src/angle/d3dcompiler/main.cpp +++ b/src/angle/src/d3dcompiler/main.cpp diff --git a/src/angle/src/src.pro b/src/angle/src/src.pro index d1f5f57591..2b7d523207 100644 --- a/src/angle/src/src.pro +++ b/src/angle/src/src.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs SUBDIRS += compiler libGLESv2 libEGL +angle_d3d11: SUBDIRS += d3dcompiler CONFIG += ordered |