Select correct externals whether using MSVC2010 or MSVC2013.

This commit is contained in:
Mathew Sutcliffe
2014-05-22 23:37:03 +01:00
parent 097525ec3e
commit 0e632705c9

View File

@@ -25,6 +25,7 @@ INCLUDEPATH *= $$EXTERNALDIR/include
# and the library path depending on the used compiler # and the library path depending on the used compiler
win32-msvc2010 {
win32:contains(QMAKE_TARGET.arch, x86_64) { win32:contains(QMAKE_TARGET.arch, x86_64) {
LIBS *= -L$$EXTERNALDIR/vs2010_64/lib LIBS *= -L$$EXTERNALDIR/vs2010_64/lib
} }
@@ -32,6 +33,16 @@ win32:contains(QMAKE_TARGET.arch, x86) {
LIBS *= -L$$EXTERNALDIR/vs2010_32/lib LIBS *= -L$$EXTERNALDIR/vs2010_32/lib
LIBS += -luser32 LIBS += -luser32
} }
}
win32-msvc2013 {
win32:contains(QMAKE_TARGET.arch, x86_64) {
LIBS *= -L$$EXTERNALDIR/vs2013_64/lib
}
win32:contains(QMAKE_TARGET.arch, x86) {
LIBS *= -L$$EXTERNALDIR/vs2013_32/lib
LIBS += -luser32
}
}
win32-g++ { win32-g++ {
WIN_FIND = $$(SYSTEMROOT)\system32\find WIN_FIND = $$(SYSTEMROOT)\system32\find