Move the new Win32 SQLite variable paths to the existing Win32 scope

This commit is contained in:
Justin Clift
2016-05-02 14:10:18 +01:00
parent c6a39d3441
commit 159cc27e56

View File

@@ -148,6 +148,11 @@ win32 {
LIBPATH_QSCINTILLA = $$LIBPATH_QSCINTILLA/release
}
QMAKE_CXXFLAGS += -DCHECKNEWVERSION
# Added SQLite installation path variables, matching our setup guide
LIBS += -L$$PWD/../../../dev/SQLite/ -lsqlite3
INCLUDEPATH += $$PWD/../../../dev/SQLite
DEPENDPATH += $$PWD/../../../dev/SQLite
}
mac {
RC_FILE = macapp.icns
@@ -168,8 +173,3 @@ DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcu
# Rules for creating/updating {ts|qm}-files
include(i18n.pri)
# Added paths to the SQLite installation
win32: LIBS += -L$$PWD/../../../dev/SQLite/ -lsqlite3
INCLUDEPATH += $$PWD/../../../dev/SQLite
DEPENDPATH += $$PWD/../../../dev/SQLite