0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-27 18:08:10 +03:00
Commit Graph

25 Commits

Author SHA1 Message Date
Arin Alexander
c5ef44c1a9 quote() changed to \" 2020-05-12 14:11:58 +03:00
fralx
c0d675f6f8
Update demo_r1.pro 2020-03-02 18:25:55 +03:00
Arin Alexander
ef7c76435a Finish 1.4.105
# Conflicts:
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
2018-10-30 01:53:34 +03:00
Arin Alexander
9bf90cf746 Cross compilations fixed 2018-10-30 00:22:43 +03:00
Arin Alex
66b1d80f38 CONFIG param "config_build_dir" has been added 2018-08-10 02:26:06 +03:00
arne krüger
85f4fcf7ae Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport
# Conflicts:
#	3rdparty/zint-2.4.4/backend_qt4/Zint.pro
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
#	designer/designer.pro
#	translations/limereport_ru.ts
2018-03-09 19:01:07 +01:00
arne krüger
da9099cecb -target names for debug built dlls have now a "d" suffix 2018-03-09 18:33:59 +01:00
Arin Alexander
40bafebbbd Qt4 build fixed 2017-10-26 13:24:06 +04:00
Spiek
6b0195cb89 If compiling in debug mode append a "d" to the Target and also link to that files 2017-07-21 17:54:22 +02:00
Spiek
ec37242475 Build Environment for Windows has been fixed
- language files are now compile-able if path to build environment contains white spaces
- demo reports are now copied correctly if REPORTS_DIR or EXTRA_DIR contains white spaces
2017-07-11 11:18:28 +02:00
Arin Alex
2c0e343c55 Static build has been fixed.
CONFIG no_zint & static_build flags have been added
2017-06-16 03:06:09 +03:00
newsages
abea99bd3f simplify DEST_BINS, DEST_LIBS 2016-04-03 15:33:41 +02:00
newsages
1acaa431c4 ARCH_TYPE
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
2016-04-03 15:08:17 +02:00
Arin Alex
57e7346e22 Fix build on Linux 2016-04-02 06:03:11 +03:00
Arin Alexander
d3038816ca Fix build on Windows 2016-04-02 06:05:41 +04:00
Arin Alex
2b0e211bc9 $$QMAKE_COPY --> $$QMAKE_COPY_DIR 2016-04-02 03:43:52 +03:00
Arin Alexander
ca1a700b61 Fix build on Windows 2016-04-01 19:46:42 +04:00
Newsages
aeb11d0318 not use end of / on $$VARIABLE_DIR for unix 2016-03-31 15:30:00 +02:00
Arin Alexander
6f35c5e2a3 Build on Linux & Mac fixed 2016-03-31 03:55:27 +03:00
newsages
7d6d7d39c8 logical Structure folders 2016-03-27 21:02:58 +02:00
newsages
7ed8d40785 Update Fork 2016-03-24 15:10:44 +01:00
newsages
d80eb334ff need end "/" for copy : REPORTS_DIR = $${DEST_DIR}/demo_reports/ 2016-03-24 12:47:39 +01:00
Arin Alex
7e78790123 Fix build demo on Linux 2016-03-22 23:12:25 +03:00
Arin Alexander
0550654b04 Some limereport's project structure changes 2016-03-22 15:55:02 +03:00
newsages
598d4f10ed Change to subforder project model. 2016-03-21 02:12:30 +01:00