Linux build fix

This commit is contained in:
Mark Watkins 2013-10-10 12:22:58 +10:00
parent d6a104f91e
commit 617912f276

View File

@ -43,7 +43,10 @@ else:DEFINES += GIT_BRANCH=\\\"UNKNOWN\\\"
exists(.git):DEFINES += GIT_REVISION=\\\"$$system(git rev-parse HEAD)\\\" exists(.git):DEFINES += GIT_REVISION=\\\"$$system(git rev-parse HEAD)\\\"
else:DEFINES += GIT_REVISION=\\\"UNKNOWN\\\" else:DEFINES += GIT_REVISION=\\\"UNKNOWN\\\"
unix:!macx:LIBS += -lX11 -lz -lGLU unix:!macx {
LIBS += -lX11 -lz -lGLU
DEFINES += _TTY_POSIX_
}
macx { macx {
LIBS += -lz LIBS += -lz
@ -226,10 +229,10 @@ use_bundled_libs {
INCLUDEPATH += $$PWD/../3rdparty/quazip INCLUDEPATH += $$PWD/../3rdparty/quazip
DEPENDPATH += $$PWD/../3rdparty/quazip DEPENDPATH += $$PWD/../3rdparty/quazip
} else { } else {
INCLUDEPATH += /usr/include
INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/local/include
DEPENDPATH += /usr/include/quazip INCLUDEPATH += /usr/include
DEPENDPATH += /usr/local/include/quazip DEPENDPATH += /usr/local/include/quazip
DEPENDPATH += /usr/include/quazip
} }
use_bundled_libs: { use_bundled_libs: {