mirror of
https://github.com/jkriege2/JKQtPlotter.git
synced 2024-12-26 02:21:43 +08:00
bugfixed build-scripts
This commit is contained in:
parent
7311948d53
commit
5e8081e088
@ -8,12 +8,12 @@ QT += core gui xml svg
|
|||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
|
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
|
||||||
|
|
||||||
|
|
||||||
DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib
|
DEPENDPATH += ../../../lib ../../../qmake/staticlib/jkqtplotterlib
|
||||||
INCLUDEPATH += ../../lib
|
INCLUDEPATH += ../../../lib
|
||||||
CONFIG (debug, debug|release) {
|
CONFIG (debug, debug|release) {
|
||||||
LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug
|
LIBS += -L../../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug
|
||||||
} else {
|
} else {
|
||||||
LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib
|
LIBS += -L../../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib
|
||||||
}
|
}
|
||||||
message("LIBS = $$LIBS")
|
message("LIBS = $$LIBS")
|
||||||
|
|
||||||
|
@ -12,8 +12,8 @@ win32 {
|
|||||||
DEFINES += JKQTP_LIB_EXPORT_LIBRARY
|
DEFINES += JKQTP_LIB_EXPORT_LIBRARY
|
||||||
}
|
}
|
||||||
|
|
||||||
include(../../lib/jkqtfastplotter.pri)
|
include(../../../lib/jkqtfastplotter.pri)
|
||||||
include(../../lib/jkqtpcommon.pri)
|
include(../../../lib/jkqtpcommon.pri)
|
||||||
|
|
||||||
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
||||||
win32-msvc*: DEFINES += NOMINMAX
|
win32-msvc*: DEFINES += NOMINMAX
|
||||||
|
@ -12,8 +12,8 @@ win32 {
|
|||||||
DEFINES += JKQTP_LIB_EXPORT_LIBRARY
|
DEFINES += JKQTP_LIB_EXPORT_LIBRARY
|
||||||
}
|
}
|
||||||
|
|
||||||
include(../../lib/jkqtmathtext.pri)
|
include(../../../lib/jkqtmathtext.pri)
|
||||||
include(../../lib/jkqtpcommon.pri)
|
include(../../../lib/jkqtpcommon.pri)
|
||||||
|
|
||||||
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
||||||
win32-msvc*: DEFINES += NOMINMAX
|
win32-msvc*: DEFINES += NOMINMAX
|
||||||
|
@ -12,7 +12,7 @@ win32 {
|
|||||||
DEFINES += JKQTP_LIB_EXPORT_LIBRARY
|
DEFINES += JKQTP_LIB_EXPORT_LIBRARY
|
||||||
}
|
}
|
||||||
|
|
||||||
include(../../lib/jkqtpcommon.pri)
|
include(../../../lib/jkqtpcommon.pri)
|
||||||
|
|
||||||
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
||||||
win32-msvc*: DEFINES += NOMINMAX
|
win32-msvc*: DEFINES += NOMINMAX
|
||||||
|
@ -16,7 +16,7 @@ win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
|||||||
win32-msvc*: DEFINES += NOMINMAX
|
win32-msvc*: DEFINES += NOMINMAX
|
||||||
|
|
||||||
|
|
||||||
include(../../lib/jkqtplotter.pri)
|
include(../../../lib/jkqtplotter.pri)
|
||||||
include(../../lib/jkqtpcommon.pri)
|
include(../../../lib/jkqtpcommon.pri)
|
||||||
include(../../lib/jkqtmathtext.pri)
|
include(../../../lib/jkqtmathtext.pri)
|
||||||
include(../../lib/jkqtfastplotter.pri)
|
include(../../../lib/jkqtfastplotter.pri)
|
@ -7,8 +7,8 @@ TEMPLATE = lib
|
|||||||
CONFIG+=staticlib
|
CONFIG+=staticlib
|
||||||
CONFIG += create_prl
|
CONFIG += create_prl
|
||||||
|
|
||||||
include(../../lib/jkqtfastplotter.pri)
|
include(../../../lib/jkqtfastplotter.pri)
|
||||||
include(../../lib/jkqtpcommon.pri)
|
include(../../../lib/jkqtpcommon.pri)
|
||||||
|
|
||||||
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
||||||
win32-msvc*: DEFINES += NOMINMAX
|
win32-msvc*: DEFINES += NOMINMAX
|
||||||
|
@ -7,8 +7,8 @@ TEMPLATE = lib
|
|||||||
CONFIG += staticlib
|
CONFIG += staticlib
|
||||||
CONFIG += create_prl
|
CONFIG += create_prl
|
||||||
|
|
||||||
include(../../lib/jkqtmathtext.pri)
|
include(../../../lib/jkqtmathtext.pri)
|
||||||
include(../../lib/jkqtpcommon.pri)
|
include(../../../lib/jkqtpcommon.pri)
|
||||||
|
|
||||||
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
||||||
win32-msvc*: DEFINES += NOMINMAX
|
win32-msvc*: DEFINES += NOMINMAX
|
||||||
|
@ -7,7 +7,7 @@ TEMPLATE = lib
|
|||||||
CONFIG += staticlib
|
CONFIG += staticlib
|
||||||
CONFIG += create_prl
|
CONFIG += create_prl
|
||||||
|
|
||||||
include(../../lib/jkqtpcommon.pri)
|
include(../../../lib/jkqtpcommon.pri)
|
||||||
|
|
||||||
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
||||||
win32-msvc*: DEFINES += NOMINMAX
|
win32-msvc*: DEFINES += NOMINMAX
|
||||||
|
@ -9,10 +9,10 @@ CONFIG += create_prl
|
|||||||
|
|
||||||
#DEFINES += JKQTBP_AUTOTIMER
|
#DEFINES += JKQTBP_AUTOTIMER
|
||||||
|
|
||||||
include(../../lib/jkqtpcommon.pri)
|
include(../../../lib/jkqtpcommon.pri)
|
||||||
include(../../lib/jkqtplotter.pri)
|
include(../../../lib/jkqtplotter.pri)
|
||||||
include(../../lib/jkqtmathtext.pri)
|
include(../../../lib/jkqtmathtext.pri)
|
||||||
include(../../lib/jkqtfastplotter.pri)
|
include(../../../lib/jkqtfastplotter.pri)
|
||||||
|
|
||||||
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
win32-msvc*: DEFINES += _USE_MATH_DEFINES
|
||||||
win32-msvc*: DEFINES += NOMINMAX
|
win32-msvc*: DEFINES += NOMINMAX
|
||||||
|
Loading…
Reference in New Issue
Block a user