From 72ea1d59923ffb8591a8298c2b817940db81b615 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Thu, 12 Dec 2013 10:15:16 +0100 Subject: [PATCH] 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 Reviewed-by: Joerg Bornemann --- src/angle/angle.pro | 1 - src/angle/{ => src}/d3dcompiler/d3dcompiler.pro | 3 +++ src/angle/{ => src}/d3dcompiler/d3dcompiler_qt.def | 0 src/angle/{ => src}/d3dcompiler/d3dcompiler_qtd.def | 0 src/angle/{ => src}/d3dcompiler/main.cpp | 0 src/angle/src/src.pro | 1 + 6 files changed, 4 insertions(+), 1 deletion(-) rename src/angle/{ => src}/d3dcompiler/d3dcompiler.pro (88%) rename src/angle/{ => src}/d3dcompiler/d3dcompiler_qt.def (100%) rename src/angle/{ => src}/d3dcompiler/d3dcompiler_qtd.def (100%) rename src/angle/{ => src}/d3dcompiler/main.cpp (100%) 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 similarity index 88% rename from src/angle/d3dcompiler/d3dcompiler.pro rename to 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 similarity index 100% rename from src/angle/d3dcompiler/d3dcompiler_qt.def rename to src/angle/src/d3dcompiler/d3dcompiler_qt.def diff --git a/src/angle/d3dcompiler/d3dcompiler_qtd.def b/src/angle/src/d3dcompiler/d3dcompiler_qtd.def similarity index 100% rename from src/angle/d3dcompiler/d3dcompiler_qtd.def rename to src/angle/src/d3dcompiler/d3dcompiler_qtd.def diff --git a/src/angle/d3dcompiler/main.cpp b/src/angle/src/d3dcompiler/main.cpp similarity index 100% rename from src/angle/d3dcompiler/main.cpp rename to 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