summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro12
1 files changed, 7 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 64a5ed7f89..7f9ebb8120 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -39,6 +39,8 @@ isEmpty(VER) {
39} 39}
40message("Qt version used:" $$VER) 40message("Qt version used:" $$VER)
41 41
42MACHINEFLAGS = $$find(QMAKE_CFLAGS, -m[63][42])
43
42RBBASE_DIR = $$_PRO_FILE_PWD_ 44RBBASE_DIR = $$_PRO_FILE_PWD_
43RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,) 45RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,)
44 46
@@ -74,25 +76,25 @@ rbspeex.commands = @$(MAKE) -s \
74 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex \ 76 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex \
75 librbspeex$$RBLIBPOSTFIX \ 77 librbspeex$$RBLIBPOSTFIX \
76 SYS_SPEEX=\"$$LIBSPEEX\" \ 78 SYS_SPEEX=\"$$LIBSPEEX\" \
77 CC=\"$$QMAKE_CC\" AR=\"$$MYAR\" 79 CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
78libucl.commands = @$(MAKE) -s \ 80libucl.commands = @$(MAKE) -s \
79 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \ 81 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \
80 libucl$$RBLIBPOSTFIX \ 82 libucl$$RBLIBPOSTFIX \
81 CC=\"$$QMAKE_CC\" AR=\"$$MYAR\" 83 CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
82libmkamsboot.commands = @$(MAKE) -s \ 84libmkamsboot.commands = @$(MAKE) -s \
83 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \ 85 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \
84 APPVERSION=\"rbutil\" \ 86 APPVERSION=\"rbutil\" \
85 libmkamsboot$$RBLIBPOSTFIX \ 87 libmkamsboot$$RBLIBPOSTFIX \
86 CC=\"$$QMAKE_CC\" AR=\"$$MYAR\" 88 CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
87libmktccboot.commands = @$(MAKE) -s \ 89libmktccboot.commands = @$(MAKE) -s \
88 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot \ 90 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot \
89 libmktccboot$$RBLIBPOSTFIX \ 91 libmktccboot$$RBLIBPOSTFIX \
90 CC=\"$$QMAKE_CC\" AR=\"$$MYAR\" 92 CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
91libmkmpioboot.commands = @$(MAKE) -s \ 93libmkmpioboot.commands = @$(MAKE) -s \
92 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkmpioboot \ 94 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkmpioboot \
93 APPVERSION=\"rbutil\" \ 95 APPVERSION=\"rbutil\" \
94 libmkmpioboot$$RBLIBPOSTFIX \ 96 libmkmpioboot$$RBLIBPOSTFIX \
95 CC=\"$$QMAKE_CC\" AR=\"$$MYAR\" 97 CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
96QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot 98QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot
97PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot 99PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot
98 100