mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

ARCH_TYPE

Browse Source 
unix{
    ARCH_DIR       = $${OUT_PWD}/unix
    ARCH_TYPE      = unix
    macx{
        ARCH_DIR       = $${OUT_PWD}/macx
        ARCH_TYPE      = macx
    }
    linux{
        !contains(QT_ARCH, x86_64){
            message("Compiling for 32bit system")
            ARCH_DIR       = $${OUT_PWD}/linux32
            ARCH_TYPE      = linux32
        }else{
            message("Compiling for 64bit system")
            ARCH_DIR       = $${OUT_PWD}/linux64
            ARCH_TYPE      = linux64
        }
    }
}
win32 {
    ARCH_DIR       = $${OUT_PWD}/win32
    ARCH_TYPE      = win32
}

DESTDIR  = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib

LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
This commit is contained in:
newsages 2016-04-03 15:08:17 +02:00
parent 70d6efccbf
commit 1acaa431c4
7 changed files with 54 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/zint-2.4.4/backend_qt4/Zint.pro vendored
View File

@ -95,7 +95,7 @@ SOURCES += \
$$PWD/../backend/upcean.c $$PWD/../backend/upcean.c
DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib DESTDIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
DLLDESTDIR = $${DESTDIR} DLLDESTDIR = $${DESTDIR}
unix { unix {
target.path = $${DESTDIR} target.path = $${DESTDIR}

22
common.pri
View File

@ -13,14 +13,28 @@ CONFIG(release, debug|release){
BUILD_DIR = $$PWD/build/$${QT_VERSION} BUILD_DIR = $$PWD/build/$${QT_VERSION}
DEST_INCLUDE_DIR = $$PWD/include DEST_INCLUDE_DIR = $$PWD/include
unix:!macx { unix{
ARCH_DIR = $${OUT_PWD}/unix ARCH_DIR = $${OUT_PWD}/unix
ARCH_TYPE = unix
macx{
ARCH_DIR = $${OUT_PWD}/macx
ARCH_TYPE = macx
}
linux{
!contains(QT_ARCH, x86_64){
message("Compiling for 32bit system")
ARCH_DIR = $${OUT_PWD}/linux32
ARCH_TYPE = linux32
}else{
message("Compiling for 64bit system")
ARCH_DIR = $${OUT_PWD}/linux64
ARCH_TYPE = linux64
}
}
} }
win32 { win32 {
ARCH_DIR = $${OUT_PWD}/win32 ARCH_DIR = $${OUT_PWD}/win32
} ARCH_TYPE = win32
macx{
ARCH_DIR = $${OUT_PWD}/macx
} }
MOC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/moc MOC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/moc

10
demo_r1/demo_r1.pro
View File

@ -18,7 +18,7 @@ RESOURCES += \
r1.qrc r1.qrc
EXTRA_DIR += $$PWD/demo_reports EXTRA_DIR += $$PWD/demo_reports
DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo_r1 DEST_DIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/demo_r1
REPORTS_DIR = $${DEST_DIR} REPORTS_DIR = $${DEST_DIR}
macx{ macx{
@ -26,9 +26,9 @@ macx{
} }
unix:{ unix:{
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -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 +54,9 @@ 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$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint
} }
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport
} }

10
demo_r2/demo_r2.pro
View File

@ -18,7 +18,7 @@ RESOURCES += \
demo_r2.qrc demo_r2.qrc
EXTRA_DIR += $$PWD/demo_reports EXTRA_DIR += $$PWD/demo_reports
DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo_r2 DEST_DIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/demo_r2
REPORTS_DIR = $${DEST_DIR} REPORTS_DIR = $${DEST_DIR}
macx{ macx{
@ -26,9 +26,9 @@ macx{
} }
unix:{ unix:{
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -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 +54,9 @@ 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$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint
} }
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport
} }

2
limereport/limereport.pro
View File

@ -26,7 +26,7 @@ EXTRA_FILES += \
include(limereport.pri) include(limereport.pri)
unix:{ unix:{
DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib DESTDIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
linux{ linux{
QMAKE_POST_LINK += mkdir -p $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/ QMAKE_POST_LINK += mkdir -p $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
for(FILE,EXTRA_FILES){ for(FILE,EXTRA_FILES){

12
translations/limereport_es_ES.ts
View File

@ -746,6 +746,18 @@ p, li { white-space: pre-wrap; }
<source> of %1</source> <source> of %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Fit page width</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fit page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>One to one</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::ProxyHolder</name> <name>LimeReport::ProxyHolder</name>

12
translations/limereport_ru.ts
View File

@ -905,6 +905,18 @@ p, li { white-space: pre-wrap; }
<source>Ctrl+P</source> <source>Ctrl+P</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Fit page width</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fit page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>One to one</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LimeReport::ProxyHolder</name> <name>LimeReport::ProxyHolder</name>