AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

produce shorter/nicer source paths

Browse Source 
Change-Id: Ia71410fdc6ee30192239e9c9efa716cfa811c13e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-01-25 17:03:35 +01:00 committed by The Qt Project
parent 93b155a850
commit 7f95a57844
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/angle/src/config.pri
View File

@ -3,7 +3,7 @@
ANGLE_DIR = $$(ANGLE_DIR) ANGLE_DIR = $$(ANGLE_DIR)
isEmpty(ANGLE_DIR) { isEmpty(ANGLE_DIR) {
ANGLE_DIR = $$PWD/../../3rdparty/angle ANGLE_DIR = $$absolute_path(../../3rdparty/angle)
} else { } else {
!build_pass:message("Using external ANGLE from $$ANGLE_DIR") !build_pass:message("Using external ANGLE from $$ANGLE_DIR")
} }
@ -13,7 +13,7 @@ isEmpty(ANGLE_DIR) {
} }
win32 { win32 {
GNUTOOLS_DIR=$$PWD/../../../../gnuwin32/bin GNUTOOLS_DIR = $$absolute_path(../../../../gnuwin32/bin)
exists($$GNUTOOLS_DIR/gperf.exe) { exists($$GNUTOOLS_DIR/gperf.exe) {
# Escape closing parens when expanding the variable, otherwise cmd confuses itself. # Escape closing parens when expanding the variable, otherwise cmd confuses itself.
GNUTOOLS = "(set PATH=$$replace(GNUTOOLS_DIR, [/\\\\], $${QMAKE_DIR_SEP});%PATH:)=^)%)" GNUTOOLS = "(set PATH=$$replace(GNUTOOLS_DIR, [/\\\\], $${QMAKE_DIR_SEP});%PATH:)=^)%)"