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 Alex
|
2c0e343c55
|
Static build has been fixed.
CONFIG no_zint & static_build flags have been added
|
2017-06-16 03:06:09 +03:00 |
|
Arin Alexander
|
ce01b9a9ab
|
MinGW build fixed
|
2016-05-20 19:16:14 +04: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 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 |
|
Arin Alexander
|
6c7443c510
|
COPYING has been added to zint
|
2016-03-22 15:52:57 +03:00 |
|
Arin Alexander
|
7a10231858
|
Zint has been pached for MSVC2010
|
2016-03-22 15:49:35 +03:00 |
|
newsages
|
598d4f10ed
|
Change to subforder project model.
|
2016-03-21 02:12:30 +01:00 |
|
newsages
|
9797b30d0a
|
Qzint , need change pro from lib to subfolder, config +=ordered, to add
zint as subproyect
|
2016-03-21 00:49:04 +01:00 |
|