diff options
| author | Benny Prijono <bennylp@teluu.com> | 2013-04-23 05:39:13 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2013-04-23 05:39:13 +0000 |
| commit | e12b016e143ffbc81d3224d282bcaec31b755c04 (patch) | |
| tree | 5f0b3fe74fc8db56ce380bc2acf736f46a4d2a32 /bb10-config.mak | |
| parent | 38bff95961417943c24b15392e0901c34e5a5650 (diff) | |
Re #1657: fixed the pjsip.pri generation script for linking with external third party libraries
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4488 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'bb10-config.mak')
| -rw-r--r-- | bb10-config.mak | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bb10-config.mak b/bb10-config.mak index 322f696d..492cbc0a 100644 --- a/bb10-config.mak +++ b/bb10-config.mak @@ -9,9 +9,10 @@ include build.mak # Generate library list (the "-lxxx" options) from list of linked libraries. -PJ_BB_LIBS = $(subst PJLIB,pjlib,$(subst .a,,$(subst lib,-l,$(subst pjlib,PJLIB,$(notdir $(APP_LIB_FILES)))))) +PJ_BB_LIBS = $(filter-out -lm -lsocket, $(APP_LDLIBS)) # This used to generate the library path list (the "-Lxxx" options) +# We replace the path with "$$PJ_DIR" PJ_BB_LDFLAGS = $(subst $(PJDIR),\$$\$$PJ_DIR,$(APP_LDFLAGS)) all: @@ -26,7 +27,7 @@ all: @echo 'PJ_INCLUDEPATH += $$$$quote($$$$PJ_DIR/pjsip/include)' @echo @for token in $(PJ_BB_LDFLAGS); do \ - if echo $$token | grep -- '-L\$$' >> /dev/null; then \ + if echo $$token | grep -- '-L' >> /dev/null; then \ echo "PJ_LIBPATH += \$$\$$quote($$token)"; \ fi; \ done @@ -38,6 +39,6 @@ all: @echo 'INCLUDEPATH += $$$$PJ_INCLUDEPATH' @echo 'LIBS += $$$$PJ_LIBPATH' @echo 'LIBS += $$$$PJ_LIBS' - @echo 'LIBS += -lOpenAL -lalut -laudio_manager -lsocket -lasound -lbbsystem' + @echo 'LIBS += -lOpenAL -lalut -laudio_manager -lsocket -lasound -lbbsystem -lm' |