Changeset 4488 for pjproject

Timestamp:

Apr 23, 2013 5:39:13 AM (11 years ago)

Author:

bennylp

Message:

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

Location:

pjproject/trunk

Files:

• bb10-config.mak (modified) (3 diffs)
• configure-bb10 (modified) (1 diff)

pjproject/trunk/bb10-config.mak

@@ -10 +10 @@
 
 # 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))
 
@@ -27 +28 @@
         @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; \
@@ -39 +40 @@
         @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'
 
 

pjproject/trunk/configure-bb10

@@ -45 +45 @@
         echo "# Auto-generated by 'configure-bb10 $*'" >> pjsip.pri
         make -f bb10-config.mak >> pjsip.pri
+
+        echo PJSIP config file for BB10 has been written to \'pjsip.pri\'. You can include this file from your application\'s .pro file.
+        echo
 fi