Merge remote-tracking branch 'gerrit/master' into newdocs

Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640

1 files changed, 53 insertions, 0 deletions

diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri
new file mode 100644
index 0000000000..e99080d19f
--- /dev/null
+++ b/src/angle/src/common/common.pri
@@ -0,0 +1,53 @@
+include (../config.pri)
+
+INCLUDEPATH += \
+    $$ANGLE_DIR/src \
+    $$ANGLE_DIR/include
+
+LIBS = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI
+
+# DirectX is included in the Windows 8 Kit, but everything else requires the DX SDK.
+win32-msvc2012 {
+    FXC = fxc.exe
+} else {
+    DX_DIR = $$(DXSDK_DIR)
+    isEmpty(DX_DIR) {
+        error("Cannot determine DirectX SDK location. Please set DXSDK_DIR environment variable.")
+    }
+
+    DXINC_DIR = $$quote($${DX_DIR}Include)
+    contains(QT_ARCH, x86_64) {
+        DXLIB_DIR = $$quote($${DX_DIR}Lib\\x64)
+    } else {
+        DXLIB_DIR = $$quote($${DX_DIR}Lib\\x86)
+    }
+
+    FXC = "\"$${DX_DIR}Utilities\\bin\\x86\\fxc.exe\""
+
+    msvc {
+        # Unfortunately MinGW cannot use the DirectX headers from the DX SDK because d3d11shader.h uses
+        # buffer annotation macros (eg: __out, __in) which are not defined in the MinGW copy of
+        # specstrings_strict.h
+        INCLUDEPATH += $$DXINC_DIR
+
+        # Similarly we want the MinGW linker to use the import libraries shipped with the compiler
+        # instead of those from the SDK which cause a crash on startup.
+        LIBS += -L$$DXLIB_DIR
+    }
+}
+
+# Use the DEF files in release mode
+msvc:CONFIG(release, debug|release) {
+    QMAKE_LFLAGS += /DEF:$$ANGLE_DIR/src/$${TARGET}/$${TARGET}.def
+}
+
+HEADERS +=  \
+    $$ANGLE_DIR/src/common/angleutils.h \
+    $$ANGLE_DIR/src/common/debug.h \
+    $$ANGLE_DIR/src/common/RefCountObject.h \
+    $$ANGLE_DIR/src/common/version.h
+
+SOURCES +=  \
+    $$ANGLE_DIR/src/common/debug.cpp \
+    $$ANGLE_DIR/src/common/RefCountObject.cpp
+