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
This commit is contained in:
Dominik Riebeling 2011-10-30 15:54:39 +00:00
parent 4ad62b7656
commit 834f18b6c7

View file

@ -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