contrib/src/qt/0003-fix-angle-compilation.patch

   1 From 5b0815cdbdc729da3135d3a9c41d7579883f739d Mon Sep 17 00:00:00 2001
   2 From: Pierre Lamot <pierre@videolabs.io>
   3 Date: Tue, 9 Apr 2019 16:39:23 +0200
   4 Subject: [PATCH] allow cross-compilation of angle with wine
   5
   6 ---
   7  src/angle/src/common/common.pri |  2 +-
   8  src/gui/configure.json          |  2 +-
   9  src/gui/configure.pri           | 24 ++----------------------
  10  3 files changed, 4 insertions(+), 24 deletions(-)
  11
  12 diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri
  13 index df29269..b6bde4d 100644
  14 --- a/src/angle/src/common/common.pri
  15 +++ b/src/angle/src/common/common.pri
  16 @@ -22,7 +22,7 @@ lib_replace.replace = \$\$\$\$[QT_INSTALL_LIBS]
  17  lib_replace.CONFIG = path
  18  QMAKE_PRL_INSTALL_REPLACE += lib_replace
  19
  20 -FXC = $$shell_quote($$shell_path($$QMAKE_FXC_LOCATION))
  21 +FXC = $$shell_path($$QMAKE_FXC_LOCATION)
  22
  23  win32 {
  24      VERSION = $$MODULE_VERSION
  25 diff --git a/src/gui/configure.json b/src/gui/configure.json
  26 index 44140bc..53f4984 100644
  27 --- a/src/gui/configure.json
  28 +++ b/src/gui/configure.json
  29 @@ -1106,7 +1106,7 @@
  30          "angle": {
  31              "label": "ANGLE",
  32              "autoDetect": "features.opengles2 || features.opengl-dynamic",
  33 -            "condition": "features.dxguid && tests.fxc && (features.direct3d9 || (config.winrt && features.direct3d11 && libs.d3dcompiler))",
  34 +            "condition": "features.dxguid && tests.fxc && (features.direct3d9 || (features.direct3d11 && libs.d3dcompiler))",
  35              "output": [
  36                  "publicFeature",
  37                  { "type": "define", "name": "QT_OPENGL_ES_2_ANGLE" },
  38 diff --git a/src/gui/configure.pri b/src/gui/configure.pri
  39 index 1b95449..875e890 100644
  40 --- a/src/gui/configure.pri
  41 +++ b/src/gui/configure.pri
  42 @@ -20,29 +20,9 @@ defineTest(qtConfLibrary_freetype) {
  43  # DXSDK_DIR variable. Starting with Windows Kit 8, it is included in
  44  # the Windows SDK.
  45  defineTest(qtConfTest_fxc) {
  46 -    !mingw {
  47 -        fxc = $$qtConfFindInPath("fxc.exe")
  48 -    } else {
  49 -        equals(QMAKE_HOST.arch, x86_64): \
  50 -            fns = x64/fxc.exe
  51 -        else: \
  52 -            fns = x86/fxc.exe
  53 -        dxdir = $$(DXSDK_DIR)
  54 -        !isEmpty(dxdir) {
  55 -            fxc = $$dxdir/Utilities/bin/$$fns
  56 -        } else {
  57 -            winkitbindir = $$(WindowsSdkVerBinPath)
  58 -            !isEmpty(winkitbindir) {
  59 -                fxc = $$winkitbindir/$$fns
  60 -            } else {
  61 -                winkitdir = $$(WindowsSdkDir)
  62 -                !isEmpty(winkitdir): \
  63 -                    fxc = $$winkitdir/bin/$$fns
  64 -            }
  65 -        }
  66 -    }
  67 +       fxc = "$$(DXSDK_DIR)/fxc2.exe"
  68
  69 -    !isEmpty(fxc):exists($$fxc) {
  70 +    !isEmpty(fxc) {
  71          $${1}.value = $$clean_path($$fxc)
  72          export($${1}.value)
  73          $${1}.cache += value
  74 --
  75 2.19.1
  76