diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -783,6 +783,7 @@ CFG_PCRE=auto QPA_PLATFORM_GUARD=yes CFG_STDCXX=auto CFG_DIRECTWRITE=no +CFG_DIRECTWRITE2=auto CFG_WERROR=auto CFG_HEADERSCLEAN=auto CFG_QREAL=double @@ -6301,6 +6302,18 @@ if [ "$CFG_LARGEFILE" != "yes" ] && [ "$XPLATFORM_MINGW" = "yes" ]; then CFG_LARGEFILE="yes" fi +# Detect DirectWrite 2 support on Windows +if [ "$CFG_DIRECTWRITE" = "no" ]; then + CFG_DIRECTWRITE2=no +fi +if [ "$CFG_DIRECTWRITE2" = "auto" ]; then + if compileTest win/directwrite2 "directwrite2"; then + CFG_DIRECTWRITE2=yes + else + CFG_DIRECTWRITE2=no + fi +fi + #------------------------------------------------------------------------------- # ask for all that hasn't been auto-detected or specified in the arguments #------------------------------------------------------------------------------- @@ -6568,6 +6581,7 @@ fi [ "$CFG_XINPUT2" = "yes" ] && QT_CONFIG="$QT_CONFIG xinput2" [ "$CFG_SYSTEM_PROXIES" = "yes" ] && QT_CONFIG="$QT_CONFIG system-proxies" [ "$CFG_DIRECTWRITE" = "yes" ] && QT_CONFIG="$QT_CONFIG directwrite" +[ "$CFG_DIRECTWRITE2" = "yes" ] && QT_CONFIG="$QT_CONFIG directwrite2" [ '!' -z "$DEFINES" ] && QMakeVar add EXTRA_DEFINES "$DEFINES" [ '!' -z "$INCLUDES" ] && QMakeVar add EXTRA_INCLUDEPATH "$INCLUDES" |