Merge pull request nesterenkodm#36 from serhiySchindler/master

pjsip 2.5.5
corefan · Aug 23, 2016 · a7f04ec · a7f04ec
2 parents b74b843 + 958b6eb
commit a7f04ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/build.sh b/build.sh
@@ -40,7 +40,7 @@ function openssl() {
 OPENH264_DIR="${BUILD_DIR}/openh264"
 OPENH264_ENABLED=
 function openh264() {
-    if [ ! -f "${OPENH264_DIR}/lib/libopenh264.a" ]; then
+    if [ ! -f "${OPENH264_DIR}/lib/libopenh264.a" ] || [ ! -d "${OPENH264_DIR}/include/wels/" ]; then
         "${__DIR__}/openh264.sh" "${OPENH264_DIR}"
     else
         echo "Using OpenH264..."

diff --git a/pjsip.podspec b/pjsip.podspec
@@ -41,6 +41,7 @@ LICENSE
                           'build/pjproject/src/pjlib-util/lib/*.a',
                           'build/pjproject/src/pjmedia/lib/*.a',
                           'build/pjproject/src/pjnath/lib/*.a',
+                          'build/pjproject/src/pjsip/lib/*.a',
                           'build/pjproject/src/third_party/lib/*.a'
 
   header_search_paths   = '"$(PODS_ROOT)/pjsip/build/pjproject/src/pjlib/include"',

diff --git a/pjsip.sh b/pjsip.sh
@@ -17,6 +17,7 @@ LIB_PATHS=("pjlib/lib" \
            "pjlib-util/lib" \
            "pjmedia/lib" \
            "pjnath/lib" \
+           "pjsip/lib" \
            "third_party/lib")
 
 OPENSSL_PREFIX=
@@ -151,30 +152,30 @@ function _build() {
 }
 
 function armv7() {
-    export CFLAGS=
+    export CFLAGS="-miphoneos-version-min=8.0"
     export LDFLAGS=
     _build "armv7"
 }
 function armv7s() {
-    export CFLAGS=
+    export CFLAGS="-miphoneos-version-min=8.0"
     export LDFLAGS=
     _build "armv7s"
 }
 function arm64() {
-    export CFLAGS=
+    export CFLAGS="-miphoneos-version-min=8.0"
     export LDFLAGS=
     _build "arm64"
 }
 function i386() {
     export DEVPATH="`xcrun -sdk iphonesimulator --show-sdk-platform-path`/Developer"
-    export CFLAGS="-O2 -m32 -mios-simulator-version-min=7.0"
-    export LDFLAGS="-O2 -m32 -mios-simulator-version-min=7.0"
+    export CFLAGS="-O2 -m32 -mios-simulator-version-min=8.0"
+    export LDFLAGS="-O2 -m32 -mios-simulator-version-min=8.0"
     _build "i386"
 }
 function x86_64() {
     export DEVPATH="`xcrun -sdk iphonesimulator --show-sdk-platform-path`/Developer"
-    export CFLAGS="-O2 -m32 -mios-simulator-version-min=7.0"
-    export LDFLAGS="-O2 -m32 -mios-simulator-version-min=7.0"
+    export CFLAGS="-O2 -m32 -mios-simulator-version-min=8.0"
+    export LDFLAGS="-O2 -m32 -mios-simulator-version-min=8.0"
     _build "x86_64"
 }