diff options
Diffstat (limited to 'src/angle/src/config.pri')
-rw-r--r-- | src/angle/src/config.pri | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri index 4e52358205..73fbc2e13b 100644 --- a/src/angle/src/config.pri +++ b/src/angle/src/config.pri @@ -3,7 +3,7 @@ ANGLE_DIR = $$(ANGLE_DIR) isEmpty(ANGLE_DIR) { - ANGLE_DIR = $$PWD/../../3rdparty/angle + ANGLE_DIR = $$absolute_path(../../3rdparty/angle) } else { !build_pass:message("Using external ANGLE from $$ANGLE_DIR") } @@ -12,20 +12,19 @@ isEmpty(ANGLE_DIR) { error("$$ANGLE_DIR does not contain ANGLE") } -win32 { - GNUTOOLS_DIR=$$PWD/../../../../gnuwin32/bin - exists($$GNUTOOLS_DIR/gperf.exe) { - # Escape closing parens when expanding the variable, otherwise cmd confuses itself. - GNUTOOLS = "(set PATH=$$replace(GNUTOOLS_DIR, [/\\\\], $${QMAKE_DIR_SEP});%PATH:)=^)%)" +equals(QMAKE_HOST.os, Windows) { + gnutools.value = $$absolute_path(../../../../gnuwin32/bin) + exists($$gnutools.value/gperf.exe) { + gnutools.name = PATH + gnutools.CONFIG = prepend } } defineReplace(addGnuPath) { - unset(gnuPath) gnuPath = $$1 - !isEmpty(gnuPath):!isEmpty(GNUTOOLS) { - eval(gnuPath = $${GNUTOOLS} && $$gnuPath) - silent: eval(gnuPath = @echo generating sources from ${QMAKE_FILE_IN} && $$val_escape($$gnuPath)) + !isEmpty(gnuPath):!isEmpty(gnutools.name) { + qtAddToolEnv(gnuPath, gnutools) + silent: gnuPath = @echo generating sources from ${QMAKE_FILE_IN} && $$gnuPath } return($$gnuPath) } |