summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/rbutilqt.pro
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-10-30 15:54:39 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-10-30 15:54:39 +0000
commit834f18b6c7f439a9c35ee1c8367210a0b7eef26e (patch)
treea010e356a52a6f7160da57bc411bfa214adb350a /rbutil/rbutilqt/rbutilqt.pro
parent4ad62b7656c656641c9176276acb73294871a220 (diff)
downloadrockbox-834f18b6c7f439a9c35ee1c8367210a0b7eef26e.tar.gz
rockbox-834f18b6c7f439a9c35ee1c8367210a0b7eef26e.tar.bz2
rockbox-834f18b6c7f439a9c35ee1c8367210a0b7eef26e.zip
Rockbox Utility: allow building for 32bit on 64bit Linux.
When building the linked libraries pass the machine flag as well. For now add them to the compiler variable directly, should go via CFLAGS later. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30868 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.pro')
-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) {
}
message("Qt version used:" $$VER)
+MACHINEFLAGS = $$find(QMAKE_CFLAGS, -m[63][42])
+
RBBASE_DIR = $$_PRO_FILE_PWD_
RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,)
@@ -74,25 +76,25 @@ rbspeex.commands = @$(MAKE) -s \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex \
librbspeex$$RBLIBPOSTFIX \
SYS_SPEEX=\"$$LIBSPEEX\" \
- CC=\"$$QMAKE_CC\" AR=\"$$MYAR\"
+ CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
libucl.commands = @$(MAKE) -s \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \
libucl$$RBLIBPOSTFIX \
- CC=\"$$QMAKE_CC\" AR=\"$$MYAR\"
+ CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
libmkamsboot.commands = @$(MAKE) -s \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \
APPVERSION=\"rbutil\" \
libmkamsboot$$RBLIBPOSTFIX \
- CC=\"$$QMAKE_CC\" AR=\"$$MYAR\"
+ CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
libmktccboot.commands = @$(MAKE) -s \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot \
libmktccboot$$RBLIBPOSTFIX \
- CC=\"$$QMAKE_CC\" AR=\"$$MYAR\"
+ CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
libmkmpioboot.commands = @$(MAKE) -s \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkmpioboot \
APPVERSION=\"rbutil\" \
libmkmpioboot$$RBLIBPOSTFIX \
- CC=\"$$QMAKE_CC\" AR=\"$$MYAR\"
+ CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot
PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot