Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
Don't search for libspeex on Windows and Mac.
Make sure to not try to dynamically link libspeex on Mac, since it's not a
standard library, and application bundles aren't statically linked anyway.
Remove looking up libspeex on Windows since it's not a standard library there
either. Don't search for libspeex multiple times but instead pass it to the
librbspeex Makefile.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27999 a1c6a512-1295-4272-9138-f99709370657
+18
-9
+17
-8
rbutil/rbutilqt/rbutilqt.pro
+17
-8
rbutil/rbutilqt/rbutilqt.pro
···
51
51
mac {
52
52
RBLIBPOSTFIX = -universal
53
53
}
54
+
# check for system speex. Add a custom rule for pre-building librbspeex if not
55
+
# found. Newer versions of speex are split up into libspeex and libspeexdsp,
56
+
# and some distributions package them separately. Check for both and fall back
57
+
# to librbspeex if not found.
58
+
# NOTE: keep adding the linker option after -lrbspeex, otherwise linker errors
59
+
# occur if the linker defaults to --as-needed
60
+
# (see http://www.gentoo.org/proj/en/qa/asneeded.xml)
61
+
#
62
+
# Always use our own copy when building statically. Don't search for libspeex
63
+
# on Mac, since we don't deploy statically there.
64
+
!static:unix:!mac {
65
+
LIBSPEEX = $$system(pkg-config --silence-errors --libs speex speexdsp)
66
+
}
67
+
54
68
rbspeex.commands = @$(MAKE) \
55
69
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex \
56
-
librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
70
+
librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" \
71
+
SYS_SPEEX=\"$$LIBSPEEX\"
57
72
libucl.commands = @$(MAKE) \
58
73
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \
59
74
libucl$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
···
91
106
92
107
LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lmktccboot -lmkmpioboot -lucl
93
108
94
-
# check for system speex. Add a custom rule for pre-building librbspeex if not
95
-
# found. Newer versions of speex are split up into libspeex and libspeexdsp,
96
-
# and some distributions package them separately. Check for both and fall back
97
-
# to librbspeex if not found.
98
-
# NOTE: keep this after -lrbspeex, otherwise linker errors occur if the linker
99
-
# defaults to --as-needed (see http://www.gentoo.org/proj/en/qa/asneeded.xml)
100
-
LIBSPEEX = $$system(pkg-config --silence-errors --libs speex speexdsp)
109
+
# Add a (possibly found) libspeex now, don't do this before -lrbspeex!
101
110
!static:!isEmpty(LIBSPEEX) {
102
111
LIBS += $$LIBSPEEX
103
112
}
+1
-1
tools/rbspeex/Makefile
+1
-1
tools/rbspeex/Makefile
···
29
29
30
30
# don't try to use the systems libspeex when building a static binary.
31
31
ifndef STATIC
32
-
SYS_SPEEX = $(shell pkg-config --silence-errors --libs speex speexdsp)
32
+
SYS_SPEEX ?= $(shell pkg-config --silence-errors --libs speex speexdsp)
33
33
endif
34
34
35
35
# fall back to our own librbspeex if no suitable found.