len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rockbox Utility: update building libs.

Browse source 
- Build libs in a libs/ folder below the build folder. This makes it easier to
  remove them when cleaning the build directory.
- Pass flags via environment instead as parameters to make. Hopefully fixes
  problems when using QtCreator on Windows.
- Respect silent config option when calling the lib Makefiles.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31525 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2012-01-02 16:59:29 +00:00
parent c5530d9258
commit 97ac4c0e34
1 changed files with 47 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

88
rbutil/rbutilqt/rbutilqt.pro
View file

@ -25,11 +25,17 @@ unix:!mac:!noccache {
} }
MYBUILDDIR = $$OUT_PWD/build/ MYBUILDDIR = $$OUT_PWD/build/
MYLIBBUILDDIR = $$MYBUILDDIR/libs/
OBJECTS_DIR = $$MYBUILDDIR/o OBJECTS_DIR = $$MYBUILDDIR/o
UI_DIR = $$MYBUILDDIR/ui UI_DIR = $$MYBUILDDIR/ui
MOC_DIR = $$MYBUILDDIR/moc MOC_DIR = $$MYBUILDDIR/moc
RCC_DIR = $$MYBUILDDIR/rcc RCC_DIR = $$MYBUILDDIR/rcc
!silent {
ADDENV = "V=1"
} else {
ADDENV = "@"
}
# check version of Qt installation # check version of Qt installation
VER = $$find(QT_VERSION, ^4\\.[5-9]+.*) VER = $$find(QT_VERSION, ^4\\.[5-9]+.*)
@ -72,53 +78,53 @@ mac {
# here. This assumes that QMAKE_CC will always be "gcc", maybe with a postfix. # here. This assumes that QMAKE_CC will always be "gcc", maybe with a postfix.
MYAR = $$replace(QMAKE_CC,gcc.*,ar) MYAR = $$replace(QMAKE_CC,gcc.*,ar)
librbspeex.commands = @$(MAKE) -s \ librbspeex.commands = $$ADDENV \
BUILD_DIR=$$MYBUILDDIR/rbspeex/ \ BUILD_DIR=$$MYLIBBUILDDIR/rbspeex/ \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex \ TARGET_DIR=$$MYLIBBUILDDIR \
librbspeex$$RBLIBPOSTFIX \
SYS_SPEEX=\"$$LIBSPEEX\" \ SYS_SPEEX=\"$$LIBSPEEX\" \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" CC=\"$$QMAKE_CC\" CFLAGS=\"$$MACHINEFLAGS\" AR=\"$$MYAR\" \
libucl.commands = @$(MAKE) -s \ $(MAKE) -C $$RBBASE_DIR/tools/rbspeex librbspeex$$RBLIBPOSTFIX
BUILD_DIR=$$MYBUILDDIR/ucl/ \ libucl.commands = $$ADDENV \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \ BUILD_DIR=$$MYLIBBUILDDIR/ucl/ \
libucl$$RBLIBPOSTFIX \ TARGET_DIR=$$MYLIBBUILDDIR \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" CC=\"$$QMAKE_CC\" CFLAGS=\"$$MACHINEFLAGS\" AR=\"$$MYAR\" \
libipodpatcher.commands = @$(MAKE) -s \ $(MAKE) -C $$RBBASE_DIR/tools/ucl/src libucl$$RBLIBPOSTFIX
BUILD_DIR=$$MYBUILDDIR/ipodpatcher/ \ libipodpatcher.commands = $$ADDENV \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/ipodpatcher \ BUILD_DIR=$$MYLIBBUILDDIR/ipodpatcher/ \
TARGET_DIR=$$MYLIBBUILDDIR \
APPVERSION=\"rbutil\" \ APPVERSION=\"rbutil\" \
libipodpatcher$$RBLIBPOSTFIX \ CC=\"$$QMAKE_CC\" CFLAGS=\"$$MACHINEFLAGS\" AR=\"$$MYAR\" \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" $(MAKE) -C $$RBBASE_DIR/rbutil/ipodpatcher libipodpatcher$$RBLIBPOSTFIX
libsansapatcher.commands = @$(MAKE) -s \ libsansapatcher.commands = $$ADDENV \
BUILD_DIR=$$MYBUILDDIR/sansapatcher/ \ BUILD_DIR=$$MYLIBBUILDDIR/sansapatcher/ \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/sansapatcher \ TARGET_DIR=$$MYLIBBUILDDIR \
APPVERSION=\"rbutil\" \ APPVERSION=\"rbutil\" \
libsansapatcher$$RBLIBPOSTFIX \ CC=\"$$QMAKE_CC\" CFLAGS=\"$$MACHINEFLAGS\" AR=\"$$MYAR\" \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" $(MAKE) -C $$RBBASE_DIR/rbutil/sansapatcher libsansapatcher$$RBLIBPOSTFIX
libmkamsboot.commands = @$(MAKE) -s \ libmkamsboot.commands = $$ADDENV \
BUILD_DIR=$$MYBUILDDIR/mkamsboot/ \ BUILD_DIR=$$MYLIBBUILDDIR/mkamsboot/ \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \ TARGET_DIR=$$MYLIBBUILDDIR \
APPVERSION=\"rbutil\" \ APPVERSION=\"rbutil\" \
libmkamsboot$$RBLIBPOSTFIX \ CC=\"$$QMAKE_CC\" CFLAGS=\"$$MACHINEFLAGS\" AR=\"$$MYAR\" \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" $(MAKE) -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot$$RBLIBPOSTFIX
libmktccboot.commands = @$(MAKE) -s \ libmktccboot.commands = $$ADDENV \
BUILD_DIR=$$MYBUILDDIR/mktccboot/ \ BUILD_DIR=$$MYLIBBUILDDIR/mktccboot/ \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot \ TARGET_DIR=$$MYLIBBUILDDIR \
APPVERSION=\"rbutil\" \ APPVERSION=\"rbutil\" \
libmktccboot$$RBLIBPOSTFIX \ CC=\"$$QMAKE_CC\" CFLAGS=\"$$MACHINEFLAGS\" AR=\"$$MYAR\" \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" $(MAKE) -C $$RBBASE_DIR/rbutil/mktccboot libmktccboot$$RBLIBPOSTFIX
libmkmpioboot.commands = @$(MAKE) -s \ libmkmpioboot.commands = $$ADDENV \
BUILD_DIR=$$MYBUILDDIR/mkmpioboot/ \ BUILD_DIR=$$MYLIBBUILDDIR/mkmpioboot/ \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkmpioboot \ TARGET_DIR=$$MYLIBBUILDDIR \
APPVERSION=\"rbutil\" \ APPVERSION=\"rbutil\" \
libmkmpioboot$$RBLIBPOSTFIX \ CC=\"$$QMAKE_CC\" CFLAGS=\"$$MACHINEFLAGS\" AR=\"$$MYAR\" \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" $(MAKE) -C $$RBBASE_DIR/rbutil/mkmpioboot libmkmpioboot$$RBLIBPOSTFIX
libchinachippatcher.commands = @$(MAKE) -s \ libchinachippatcher.commands = $$ADDENV \
BUILD_DIR=$$MYBUILDDIR/chinachippatcher/ \ BUILD_DIR=$$MYLIBBUILDDIR/chinachippatcher/ \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/chinachippatcher \ TARGET_DIR=$$MYLIBBUILDDIR \
APPVERSION=\"rbutil\" \ APPVERSION=\"rbutil\" \
libchinachippatcher$$RBLIBPOSTFIX \ CC=\"$$QMAKE_CC\" CFLAGS=\"$$MACHINEFLAGS\" AR=\"$$MYAR\" \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" $(MAKE) -C $$RBBASE_DIR/rbutil/chinachippatcher libchinachippatcher$$RBLIBPOSTFIX
# Note: order is important for RBLIBS! The libs are appended to the linker # Note: order is important for RBLIBS! The libs are appended to the linker
# flags in this order, put libucl at the end. # flags in this order, put libucl at the end.
RBLIBS = librbspeex libipodpatcher libsansapatcher libmkamsboot libmktccboot \ RBLIBS = librbspeex libipodpatcher libsansapatcher libmkamsboot libmktccboot \
@ -146,7 +152,7 @@ INCLUDEPATH += $$RBBASE_DIR/rbutil/ipodpatcher $$RBBASE_DIR/rbutil/sansapatcher
DEPENDPATH = $$INCLUDEPATH DEPENDPATH = $$INCLUDEPATH
LIBS += -L$$OUT_PWD -L$$MYBUILDDIR LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR
# append all RBLIBS to LIBS # append all RBLIBS to LIBS
for(rblib, RBLIBS) { for(rblib, RBLIBS) {
LIBS += -l$$replace(rblib, lib,) LIBS += -l$$replace(rblib, lib,)