Changeset 4488


Ignore:
Timestamp:
Apr 23, 2013 5:39:13 AM (6 years ago)
Author:
bennylp
Message:

Re #1657: fixed the pjsip.pri generation script for linking with external third party libraries

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/bb10-config.mak

    r4468 r4488  
    1010 
    1111# Generate library list (the "-lxxx" options) from list of linked libraries. 
    12 PJ_BB_LIBS = $(subst PJLIB,pjlib,$(subst .a,,$(subst lib,-l,$(subst pjlib,PJLIB,$(notdir $(APP_LIB_FILES)))))) 
     12PJ_BB_LIBS = $(filter-out -lm -lsocket, $(APP_LDLIBS)) 
    1313 
    1414# This used to generate the library path list (the "-Lxxx" options) 
     15# We replace the path with "$$PJ_DIR" 
    1516PJ_BB_LDFLAGS = $(subst $(PJDIR),\$$\$$PJ_DIR,$(APP_LDFLAGS)) 
    1617 
     
    2728        @echo 
    2829        @for token in $(PJ_BB_LDFLAGS); do \ 
    29                 if echo $$token | grep -- '-L\$$' >> /dev/null; then \ 
     30                if echo $$token | grep -- '-L' >> /dev/null; then \ 
    3031                        echo "PJ_LIBPATH += \$$\$$quote($$token)"; \ 
    3132                fi; \ 
     
    3940        @echo 'LIBS += $$$$PJ_LIBPATH' 
    4041        @echo 'LIBS += $$$$PJ_LIBS' 
    41         @echo 'LIBS += -lOpenAL -lalut -laudio_manager -lsocket -lasound -lbbsystem' 
     42        @echo 'LIBS += -lOpenAL -lalut -laudio_manager -lsocket -lasound -lbbsystem -lm' 
    4243 
    4344 
  • pjproject/trunk/configure-bb10

    r4468 r4488  
    4545        echo "# Auto-generated by 'configure-bb10 $*'" >> pjsip.pri 
    4646        make -f bb10-config.mak >> pjsip.pri 
     47 
     48        echo PJSIP config file for BB10 has been written to \'pjsip.pri\'. You can include this file from your application\'s .pro file. 
     49        echo 
    4750fi 
    4851 
Note: See TracChangeset for help on using the changeset viewer.