Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 183494 | Differences between
and this patch

Collapse All | Expand All

(-)rbutilqt.pro.orig (-6 / +12 lines)
Lines 45-50 Link Here
45
45
46
message("Rockbox Base dir: "$$RBBASE_DIR)
46
message("Rockbox Base dir: "$$RBBASE_DIR)
47
47
48
unix {
49
	# Some of the tool's Makefiles do not create their build dir with "mkdir -p", so do it here:
50
	LIST = rbspeex ucl mkamsboot mktccboot mkmpioboot
51
	for(dir, LIST):!exists($$MYBUILDDIR/$$dir):system(mkdir -p $$MYBUILDDIR/$$dir)
52
}
53
48
# custom rules for rockbox-specific libs
54
# custom rules for rockbox-specific libs
49
!mac {
55
!mac {
50
    RBLIBPOSTFIX = .a
56
    RBLIBPOSTFIX = .a
Lines 67-86 Link Here
67
}
67
}
68
68
69
rbspeex.commands = @$(MAKE) \
69
rbspeex.commands = @$(MAKE) \
70
        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex \
70
        TARGET_DIR=$$MYBUILDDIR/rbspeex/ -C $$RBBASE_DIR/tools/rbspeex \
71
        librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" \
71
        librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" \
72
        SYS_SPEEX=\"$$LIBSPEEX\"
72
        SYS_SPEEX=\"$$LIBSPEEX\"
73
libucl.commands = @$(MAKE) \
73
libucl.commands = @$(MAKE) \
74
        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \
74
        TARGET_DIR=$$MYBUILDDIR/ucl/ -C $$RBBASE_DIR/tools/ucl/src \
75
        libucl$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
75
        libucl$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
76
libmkamsboot.commands = @$(MAKE) \
76
libmkamsboot.commands = @$(MAKE) \
77
        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \
77
        TARGET_DIR=$$MYBUILDDIR/mkamsboot/ -C $$RBBASE_DIR/rbutil/mkamsboot \
78
        libmkamsboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
78
        libmkamsboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
79
libmktccboot.commands = @$(MAKE) \
79
libmktccboot.commands = @$(MAKE) \
80
        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot \
80
        TARGET_DIR=$$MYBUILDDIR/mktccboot/ -C $$RBBASE_DIR/rbutil/mktccboot \
81
        libmktccboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
81
        libmktccboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
82
libmkmpioboot.commands = @$(MAKE) \
82
libmkmpioboot.commands = @$(MAKE) \
83
        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkmpioboot \
83
        TARGET_DIR=$$MYBUILDDIR/mkmpioboot/ -C $$RBBASE_DIR/rbutil/mkmpioboot \
84
        libmkmpioboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
84
        libmkmpioboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
85
QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot
85
QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot
86
PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot
86
PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot
Lines 105-111 Link Here
105
105
106
DEPENDPATH = $$INCLUDEPATH
106
DEPENDPATH = $$INCLUDEPATH
107
107
108
LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lmktccboot -lmkmpioboot -lucl
108
LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -L$$MYBUILDDIR/rbspeex/ -lrbspeex -L$$MYBUILDDIR/mkamsboot/ -lmkamsboot -L$$MYBUILDDIR/mktccboot/ -lmktccboot -L$$MYBUILDDIR/mkmpioboot/ -lmkmpioboot -L$$MYBUILDDIR/ucl/ -lucl
109
109
110
# Add a (possibly found) libspeex now, don't do this before -lrbspeex!
110
# Add a (possibly found) libspeex now, don't do this before -lrbspeex!
111
!static:!isEmpty(LIBSPEEX) {
111
!static:!isEmpty(LIBSPEEX) {

Return to bug 183494