mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-25 01:51:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9 from srazi/master

Browse Source 
Move similar preferences to common.pri
This commit is contained in:
Jan W. Krieger 2018-12-31 12:50:17 +01:00 committed by GitHub
commit ba6e929ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/common.pri Normal file
View File

@ -0,0 +1,22 @@
!win32-msvc* {
QMAKE_CXXFLAGS += -fexceptions
} else {
QMAKE_CXXFLAGS += /EHsc
# To enable M_PI, M_E,...
DEFINES += _USE_MATH_DEFINES
# To fix error: C2338: va_start argument must not
# have reference type and must not be parenthesized
DEFINES += _CRT_NO_VA_START_VALIDATION
}
HEADERS += $$PWD/jkqtplottertools/jkqtp_imexport.h \
$$PWD/jkqtplottertools/jkqtptools.h
SOURCES += $$PWD/jkqtplottertools/jkqtptools.cpp
INCLUDEPATH += $$PWD
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport

22
lib/jkqtfastplotter.pri
View File

@ -1,31 +1,15 @@
include($$PWD/common.pri)
!win32-msvc* {
QMAKE_CXXFLAGS += -fexceptions
} else {
QMAKE_CXXFLAGS += /EHsc
# To enable M_PI, M_E,...
DEFINES += _USE_MATH_DEFINES
# To fix error: C2338: va_start argument must not
# have reference type and must not be parenthesized
DEFINES += _CRT_NO_VA_START_VALIDATION
}
HEADERS += $$PWD/jkqtfastplotter/jkqtfastplotter.h \
$$PWD/jkqtplottertools/jkqtptools.h \
$$PWD/jkqtplottertools/jkqtphighrestimer.h \
$$PWD/jkqtplottertools/jkqtp_imexport.h
$$PWD/jkqtplottertools/jkqtphighrestimer.h
SOURCES += $$PWD/jkqtfastplotter/jkqtfastplotter.cpp \
$$PWD/jkqtplottertools/jkqtptools.cpp \
$$PWD/jkqtplottertools/jkqtphighrestimer.cpp
RESOURCES += $$PWD/jkqtplotterressources/jkqtpbaseplotter.qrc
INCLUDEPATH += $$PWD
QT += core gui opengl
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
QT += opengl

12
lib/jkqtmathtext.pri
View File

@ -1,17 +1,13 @@
HEADERS += $$PWD/jkqtmathtext/jkqtmathtext.h \
$$PWD/jkqtplottertools/jkqtptools.h \
$$PWD/jkqtplottertools/jkqtp_imexport.h
include($$PWD/common.pri)
SOURCES += $$PWD/jkqtmathtext/jkqtmathtext.cpp \
$$PWD/jkqtplottertools/jkqtptools.cpp
HEADERS += $$PWD/jkqtmathtext/jkqtmathtext.h
SOURCES += $$PWD/jkqtmathtext/jkqtmathtext.cpp
INCLUDEPATH += $$PWD
include($$PWD/jkqtplotterressources/math_fonts/xits.pri)
DEFINES += AUTOLOAD_XITS_FONTS
QT += core gui
#win32:LIBS += -lgdi32
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport

20
lib/jkqtplotter.pri
View File

@ -1,14 +1,6 @@
!win32-msvc* {
QMAKE_CXXFLAGS += -fexceptions
} else {
QMAKE_CXXFLAGS += /EHsc
# To enable M_PI, M_E,...
DEFINES += _USE_MATH_DEFINES
# To fix error: C2338: va_start argument must not
# have reference type and must not be parenthesized
DEFINES += _CRT_NO_VA_START_VALIDATION
}
include($$PWD/common.pri)
HEADERS += \
$$PWD/jkqtfastplotter/jkqtfastplotter.h \
@ -34,13 +26,11 @@ HEADERS += \
$$PWD/jkqtplottergui/jkqtpenhancedtableview.h \
$$PWD/jkqtplottergui/jkqtpgraphsmodel.h \
$$PWD/jkqtplottergui/jkvanishqtoolbar.h \
$$PWD/jkqtplottertools/jkqtp_imexport.h \
$$PWD/jkqtplottertools/jkqtpdrawingtools.h \
$$PWD/jkqtplottertools/jkqtpenhancedpainter.h \
$$PWD/jkqtplottertools/jkqtphighrestimer.h \
$$PWD/jkqtplottertools/jkqtpimagetools.h \
$$PWD/jkqtplottertools/jkqtpmathparser.h \
$$PWD/jkqtplottertools/jkqtptools.h \
$$PWD/jkqtplottertools/jkqttools.h
@ -73,16 +63,12 @@ SOURCES += \
$$PWD/jkqtplottertools/jkqtphighrestimer.cpp \
$$PWD/jkqtplottertools/jkqtpimagetools.cpp \
$$PWD/jkqtplottertools/jkqtpmathparser.cpp \
$$PWD/jkqtplottertools/jkqtptools.cpp \
$$PWD/jkqtplottertools/jkqttools.cpp
RESOURCES += $$PWD/jkqtplotterressources/jkqtpbaseplotter.qrc
INCLUDEPATH += $$PWD
QT += core gui xml svg opengl
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
QT += xml svg opengl
include($$PWD/jkqtplotterressources/math_fonts/xits.pri)
DEFINES += AUTOLOAD_XITS_FONTS