-target names for debug built dlls have now a "d" suffix

This commit is contained in:
arne krüger 2018-03-09 18:33:59 +01:00
parent dbd753b4d3
commit da9099cecb
8 changed files with 132 additions and 15 deletions

View File

@ -19,7 +19,16 @@ unix{
INCLUDEPATH += $$PWD/../backend INCLUDEPATH += $$PWD/../backend
DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\" DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\"
DEFINES += QZINT_LIBRARY DEFINES += QZINT_LIBRARY
TARGET = QtZint #TARGET = QtZint
CONFIG(debug, debug|release) {
TARGET = QtZintd
} else {
TARGET = QtZint
}
!contains(DEFINES, NO_PNG) { !contains(DEFINES, NO_PNG) {
SOURCES += $$PWD/../backend/png.c SOURCES += $$PWD/../backend/png.c

View File

@ -26,9 +26,21 @@ macx{
} }
unix:{ unix:{
LIBS += -L$${DEST_LIBS} -llimereport LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -llimereportd
} else {
LIBS += -llimereport
}
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
} }
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
# QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | # QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
@ -54,9 +66,19 @@ win32 {
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
} }
LIBS += -L$${DEST_LIBS} -llimereport LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -llimereportd
} else {
LIBS += -llimereport
}
} }

View File

@ -26,9 +26,19 @@ macx{
} }
unix:{ unix:{
LIBS += -L$${DEST_LIBS} -llimereport LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -llimereportd
} else {
LIBS += -llimereport
}
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
} }
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
@ -52,9 +62,19 @@ win32 {
RC_FILE += mainicon.rc RC_FILE += mainicon.rc
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
}
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -llimereportd
} else {
LIBS += -llimereport
} }
LIBS += -L$${DEST_LIBS} -llimereport
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t)
} }

View File

@ -17,9 +17,19 @@ macx{
} }
unix:{ unix:{
LIBS += -L$${DEST_LIBS} -llimereport LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -llimereportd
} else {
LIBS += -llimereport
}
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
} }
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
linux{ linux{
@ -42,8 +52,18 @@ win32 {
RC_FILE += mainicon.rc RC_FILE += mainicon.rc
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
}
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -llimereportd
} else {
LIBS += -llimereport
} }
LIBS += -L$${DEST_LIBS} -llimereport
} }

View File

@ -1,4 +1,13 @@
TARGET = limereport #TARGET = limereport
CONFIG(debug, debug|release) {
TARGET = limereportd
} else {
TARGET = limereport
}
TEMPLATE = lib TEMPLATE = lib
CONFIG += lib CONFIG += lib
@ -60,7 +69,14 @@ contains(CONFIG,zint){
message(zint) message(zint)
INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4
DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4
LIBS += -L$${DEST_LIBS} -lQtZint LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
} }
####### #######

View File

@ -1563,6 +1563,16 @@ p, li { white-space: pre-wrap; }
<source>Preview</source> <source>Preview</source>
<translation type="unfinished">معاينة</translation> <translation type="unfinished">معاينة</translation>
</message> </message>
<message>
<source>Report File Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The report file &quot;%1&quot; has changed names or been deleted.
This preview is no longer valid.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::ReportFooter</name> <name>LimeReport::ReportFooter</name>

View File

@ -1388,6 +1388,16 @@ p, li { white-space: pre-wrap; }
<source>Preview</source> <source>Preview</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Report File Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The report file &quot;%1&quot; has changed names or been deleted.
This preview is no longer valid.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::ReportFooter</name> <name>LimeReport::ReportFooter</name>

View File

@ -1504,6 +1504,16 @@ p, li { white-space: pre-wrap; }
<source>Preview</source> <source>Preview</source>
<translation>Предосмотр</translation> <translation>Предосмотр</translation>
</message> </message>
<message>
<source>Report File Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The report file &quot;%1&quot; has changed names or been deleted.
This preview is no longer valid.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::ReportFooter</name> <name>LimeReport::ReportFooter</name>