Changeset 4468 for pjproject/trunk

Timestamp:

Apr 15, 2013 10:37:59 AM (12 years ago)

Author:

bennylp

Message:

Re #1657: BB Integration:

• The configure-bb10 now outputs pjsip.pri to be included by application's .pro file in order to get PJSIP's settings included in the app's project
• The configure-bb10 now also sets PJ_CONFIG_BB10 macro for platform detection by lib/app

Location:

pjproject/trunk

Files:

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

pjproject/trunk/configure-bb10

@@ -34 +34 @@
 LD="${QNX_HOST}/usr/bin/nto${TARGET_ARCH}-ld " 
 export LDFLAGS=" -L${QNX_TARGET}/${LIBDIR}/usr/lib -L${QNX_TARGET}/${LIBDIR}/lib -L${QNX_HOST}/usr/lib/gcc/${TARGET_HOST}/4.6.3 -lgcc -lasound -laudio_manager"
-export CFLAGS=" -g -fPIC -DPJMEDIA_AUDIO_DEV_HAS_BB10=1 " 
+export CFLAGS=" -g -fPIC -DPJ_CONFIG_BB10=1 -DPJMEDIA_AUDIO_DEV_HAS_BB10=1" 
 
+# Invoke configure
 ./configure --host=${TARGET_HOST} --disable-oss $*
+RETVAL=$?
+
+# Write to pjsip.pri only if configure was successful
+if test $RETVAL -eq 0; then
+        echo "# Config file to be included in app's .pro file" > pjsip.pri
+        echo "# Auto-generated by 'configure-bb10 $*'" >> pjsip.pri
+        make -f bb10-config.mak >> pjsip.pri
+fi
+
+