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

Fix building Rockbox Utility when using newer versions of libspeex.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23164 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-10-13 20:53:25 +00:00
parent 81ef39bd8d
commit bc748951b9
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rbutil/rbutilqt/rbutilqt.pro
View file

@ -28,8 +28,11 @@ RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,)
message("Rockbox Base dir: "$$RBBASE_DIR) message("Rockbox Base dir: "$$RBBASE_DIR)
# check for system speex. Add a custom rule for pre-building librbspeex if not found. # check for system speex. Add a custom rule for pre-building librbspeex if not found.
LIBSPEEX = $$system(pkg-config --libs speex) LIBSPEEX = $$system(pkg-config --silence-errors --libs speex)
!static:!isEmpty(LIBSPEEX) { !static:!isEmpty(LIBSPEEX)
# newer versions of speex are split up into libspeex and libspeexdsp.
# avoid checking twice if libspeex is missing.
LIBSPEEX += $$system(pkg-config --silence-errors --libs speexdsp)
LIBS += $$LIBSPEEX LIBS += $$LIBSPEEX
} }
!mac { !mac {

5
tools/rbspeex/Makefile
View file

@ -33,7 +33,10 @@ endif
# don't try to use the systems libspeex when building a static binary. # don't try to use the systems libspeex when building a static binary.
ifndef STATIC ifndef STATIC
SYS_SPEEX = $(shell pkg-config --libs speex) SYS_SPEEX = $(shell pkg-config --silence-errors --libs speex)
ifneq ($(SYS_SPEEX),)
SYS_SPEEX += $(shell pkg-config --silence-errors --libs speexdsp)
endif
endif endif
# fall back to our own librbspeex if no suitable found. # fall back to our own librbspeex if no suitable found.