diff options
| author | Erik van Pienbroek <epienbro@fedoraproject.org> | 2012-12-10 21:34:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-12 15:23:41 +0100 |
| commit | 40fb2ea92a906b2c295d978555b25ea2794d4306 (patch) | |
| tree | d9e85809fcd65aca9abd99acde490712c4abf75b /configure | |
| parent | 1ef0470a5c67c76fba1b7ffb21dfd89f3f07dae3 (diff) | |
Add directwrite support to the configure script
The configure.exe already supported the -directwrite flag for some time.
This commit adds this flag to the configure script as well so
environments which use MinGW as cross-compiler can now also
optionally enable DirectWrite support.
The original configure.exe pieces were added in commit
c0fed43b04dec8bd549043d3ea5e28908128082c of the Qt4 repository.
The directwrite argument which this commit adds to the configure
script and the behaviour of it should be exactly the same as the
current configure.exe.
To get Qt built with DirectWrite support using the MinGW-w64 toolchain
at least mingw-w64 trunk revision 5451 (Nov 10 2012) is needed
Change-Id: I519718068cf5732c7ebcbf0a0fafb6b747db0bcf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -874,6 +874,7 @@ CFG_FORCE_ASSERTS=no CFG_PCRE=auto QPA_PLATFORM_GUARD=yes CFG_CXX11=auto +CFG_DIRECTWRITE=no # initalize variables used for installation QT_INSTALL_PREFIX= @@ -2116,6 +2117,17 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + directwrite) + if [ "$XPLATFORM_MINGW" = "yes" ] ; then + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DIRECTWRITE="$VAL" + else + UNKNOWN_OPT=yes + fi + else + UNKNOWN_OPT=yes + fi + ;; *) UNKNOWN_OPT=yes ;; @@ -5468,6 +5480,7 @@ fi [ "$CFG_XCB" != "no" ] && QT_CONFIG="$QT_CONFIG xcb" [ "$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" [ '!' -z "$DEFINES" ] && QMakeVar add DEFINES "$DEFINES" [ '!' -z "$L_FLAGS" ] && QMakeVar add LIBS "$L_FLAGS" @@ -6277,6 +6290,10 @@ echo "FontConfig support ..... $CFG_FONTCONFIG" echo "XKB Support ............ $CFG_XKB" echo "GTK theme support ...... $CFG_QGTKSTYLE" +if [ "$XPLATFORM_MINGW" = "yes" ] ; then + echo "DirectWrite support .... $CFG_DIRECTWRITE" +fi + [ "$CFG_SQL_mysql" != "no" ] && echo "MySQL support .......... $CFG_SQL_mysql" [ "$CFG_SQL_psql" != "no" ] && echo "PostgreSQL support ..... $CFG_SQL_psql" [ "$CFG_SQL_odbc" != "no" ] && echo "ODBC support ........... $CFG_SQL_odbc" |