1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140
|
diff --git a/global.pri b/global.pri
index 5980d1d..2cd3fe1 100644
--- a/global.pri
+++ b/global.pri
@@ -17,71 +17,24 @@
#
# This is the relative directory path to the openrpt project.
#
-exists(../../../openrpt) {
- OPENRPT_DIR = ../../../openrpt
-}
-exists(../../openrpt) {
- OPENRPT_DIR = ../../openrpt
-}
-exists(../openrpt) {
- OPENRPT_DIR = ../openrpt
-}
-!exists(openrpt) {
- exists(../openrpt) {
- OPENRPT_DIR = ../openrpt
- }
-}
-
-! exists($${OPENRPT_DIR}) {
- error("Could not set the OPENRPT_DIR qmake variable.")
-}
-
-OPENRPT_BLD = $${OPENRPT_DIR}
-exists($${OPENRPT_DIR}-build-desktop) {
- OPENRPT_BLD = $${OPENRPT_DIR}-build-desktop
-}
-exists(../../../csvimp) {
- CSVIMP_DIR = ../../../csvimp
-}
-exists(../../csvimp) {
- CSVIMP_DIR = ../../csvimp
-}
-exists(../csvimp) {
- CSVIMP_DIR = ../csvimp
-
-}
-
-!exists(csvimp) {
- exists(../csvimp) {
- CSVIMP_DIR = ../csvimp
- }
-}
-
-! exists($${CSVIMP_DIR}) {
- error("Could not set the CSVIMP_DIR qmake variable.")
-}
-
-CSVIMP_BLD = $${CSVIMP_DIR}
-exists($${CSVIMP_DIR}-build-desktop) {
- CSVIMP_BLD = $${CSVIMP_DIR}-build-desktop
-}
-
-INCLUDEPATH += ../$${OPENRPT_DIR}/common ../$${OPENRPT_BLD}/common \
- ../$${OPENRPT_DIR}/OpenRPT/renderer ../$${OPENRPT_BLD}/OpenRPT/renderer \
- ../$${OPENRPT_DIR}/OpenRPT/wrtembed ../$${OPENRPT_BLD}/OpenRPT/wrtembed \
- ../$${OPENRPT_DIR}/MetaSQL ../$${OPENRPT_BLD}/MetaSQL \
- ../$${OPENRPT_DIR}/MetaSQL/tmp ../$${OPENRPT_BLD}/MetaSQL/tmp \
- ../$${CSVIMP_DIR}/csvimpcommon ../$${CSVIMP_BLD}/csvimpcommon
+OPENRPT_DIR = /usr/include/openrpt
+OPENRPT_BLD = /usr/lib/$$(DEB_HOST_MULTIARCH)
+#OPENRPT_BLD = /usr/lib/openrpt
+
+CSVIMP_DIR = /usr/include/csvimp
+CSVIMP_BLD = /usr/lib/$$(DEB_HOST_MULTIARCH)
+#CSVIMP_BLD = /usr/lib/csvimp
+
+INCLUDEPATH += $${OPENRPT_DIR}/common \
+ $${OPENRPT_DIR}/OpenRPT/renderer \
+ $${OPENRPT_DIR}/OpenRPT/wrtembed \
+ $${OPENRPT_DIR}/MetaSQL \
+ $${OPENRPT_DIR}/MetaSQL/tmp \
+ $${CSVIMP_DIR}/csvimpcommon
INCLUDEPATH = $$unique(INCLUDEPATH)
-XTUPLE_DIR=../../qt-client
-! exists(../qt-client) {
- XTUPLE_DIR=../../xtuple
-}
+XTUPLE_DIR=../
XTUPLE_BLD=$${XTUPLE_DIR}
-exists(../xtuple-build-desktop) {
- XTUPLE_BLD=../../xtuple-build-desktop
-}
DEPENDPATH += $${INCLUDEPATH}
diff --git a/guiclient/guiclient.pro b/guiclient/guiclient.pro
index 5b89587..6747beb 100644
--- a/guiclient/guiclient.pro
+++ b/guiclient/guiclient.pro
@@ -23,16 +23,15 @@ win32-msvc* {
PRE_TARGETDEPS += ../lib/libxtuplecommon.a \
../lib/libxtuplescriptapi.a \
../lib/libxtuplewidgets.a \
- ../$${OPENRPT_BLD}/lib/libMetaSQL.a \
- ../$${OPENRPT_BLD}/lib/librenderer.a \
- ../$${OPENRPT_BLD}/lib/libwrtembed.a \
- ../$${OPENRPT_BLD}/lib/libDmtx_Library.a \
- ../$${OPENRPT_BLD}/lib/libcommon.a
+ $${OPENRPT_BLD}/libMetaSQL.a \
+ $${OPENRPT_BLD}/librenderer.a \
+ $${OPENRPT_BLD}/libwrtembed.a \
+ $${OPENRPT_BLD}/libcommon.a
}
-LIBS += -L../lib -L../$${OPENRPT_BLD}/lib \
+LIBS += -L../lib -L$${OPENRPT_BLD} \
-lxtuplecommon -lxtuplewidgets -lwrtembed -lcommon -lrenderer \
- -lxtuplescriptapi -lDmtx_Library -lMetaSQL
+ -lxtuplescriptapi -ldmtx -lMetaSQL
#not the best way to handle this, but it should do
mac:!static:contains(QT_CONFIG, qt_framework) {
@@ -1827,7 +1826,7 @@ include( hunspell.pri )
QT += xml sql script scripttools network
QT += webkit xmlpatterns
-RESOURCES += guiclient.qrc ../$${OPENRPT_DIR}/OpenRPT/images/OpenRPTMetaSQL.qrc
+RESOURCES += guiclient.qrc /usr/share/openrpt/OpenRPT/images/OpenRPTMetaSQL.qrc
#CONFIG += debug
diff --git a/widgets/widgets.pro b/widgets/widgets.pro
index f7d92c5..e6d1dcd 100644
--- a/widgets/widgets.pro
+++ b/widgets/widgets.pro
@@ -16,7 +16,7 @@ dynamic {
CONFIG += dll # this is technically redundant as plugin implies dll however it fixes a cross-compile problem
DESTDIR = $$[QT_INSTALL_PLUGINS]/designer
LIBS += -L../lib \
- -L../$$OPENRPT_BLD/lib \
+ -L$$OPENRPT_BLD \
-lxtuplecommon \
-lwrtembed \
-lrenderer \
|