Add TLS/SSL backend: Windows Schannel (#3867)

Previous SECLEVEL support allowed for levels 1-5.
However, openssl defines levels 0-5. [1]

Recent openssl versions (3.0+) have moved previous
popular ciphers/key lengths (i.e. RSA1024withSHA1)
into level 0, so it is now a reasonable choice to use.

Add support for level 0.

[1] https://www.openssl.org/docs/man3.2/man3/SSL_CTX_set_security_level.html

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+# properties
+[*.{h,c,hpp,cpp,m,java}]
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+# trim_trailing_whitespace = true

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# expand tab to spaces and remove $Id$ (#3292)
+5ac9104514499d648f68991ef796368c51b4dfec

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,64 @@
+name: Bug report
+description: File a bug report
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for filing a bug report with us. We appreciate your effort in helping us improve our software.
+        
+        **IMPORTANT**: Please note that this form is **strictly** for reporting bugs, and as such, any questions or inquiries that are not related to bugs will be closed. We apologize for any inconvenience this may cause and appreciate your understanding in keeping our bug reporting system focused and efficient.
+  - type: textarea
+    id: bug-desc
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+      placeholder: |
+        E.g: Assertion when answering an incoming video call with response code 183.
+    validations:
+      required: true
+  - type: textarea
+    id: bug-repro
+    attributes:
+      label: Steps to reproduce
+      description: Describe how to reproduce the bug using sample apps such as [pjsua app](https://www.pjsip.org/pjsua.htm), [pjsua2 android](https://docs.pjsip.org/en/latest/get-started/android/build_instructions.html#building-and-running-pjsua2-sample-application), [iOS ipjsua](https://docs.pjsip.org/en/latest/get-started/ios/build_instructions.html#building-pjsip), or [other sample apps](https://github.com/pjsip/pjproject/tree/master/pjsip-apps/src/samples).
+      placeholder: |
+        E.g:
+        1. run pjsua app with parameter: `--video --registrar sip:some.sip.registrar ...`
+        2. make video call from other SIP client or another pjsua instance
+        3. answer the call with 180 and soon 183, assertion occurs!
+        The assertion didn't occur if the call was answered with 183 directly.
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: PJSIP version
+      description: What PJSIP version are you using? (We suggest testing with the latest version to ensure that the bug is still present and has not been resolved.)
+      placeholder: |
+        E.g: 2.13
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Context
+      description: |
+        Context where the bug occurs, e.g: platform, device, OS version, configuration settings.
+      placeholder: |
+        E.g:
+        - The issue happens on Windows/Linux/MacOS desktop, iPhone 12, or Android device XYZ.
+        - App is built using Android NDK r20 or newer.
+        - 'configure-android' param: ...
+        - 'config_site.h' contents: ...
+        - Related third-party lib & version: ... (e.g: OpenSSL 1.1.1b)
+        - Applied patch(es): (e.g: patches from issue/PR #xyz)
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Log, call stack, etc
+      description: Please copy and paste any relevant PJSIP log output (with verbosity level 5), call stack trace, etc which may be useful for the investigation. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+blank_issues_enabled: false
+contact_links:
+  - name: PJSIP tag on Stack Overflow
+    url: https://stackoverflow.com/questions/tagged/pjsip

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,28 @@
+name: Feature request
+description: Submit a feature request
+labels: 'type: enhancement'
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for submitting a feature request to us.
+        
+        **IMPORTANT**: Please note that this form is **strictly** for feature request submission, and as such, any questions or inquiries that are not related to feature requests will be closed. We apologize for any inconvenience this may cause and appreciate your understanding in keeping our Github issues focused and efficient.
+  - type: textarea
+    id: feature-req
+    attributes:
+      label: Describe the feature
+      description: A clear and concise description of what feature you wish for.
+    validations:
+      required: true
+  - type: textarea
+    id: alt-solution
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've 
+considered.
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1,31 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+<!--- Describe your changes in detail -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Screenshots (if appropriate):
+
+## Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+## Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+- [ ] My code follows the code style of this project.
+- [ ] My change requires a change to the documentation.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have read the **CONTRIBUTING** document.
+- [ ] I have added tests to cover my changes.
+- [ ] All new and existing tests passed.

.github/workflows/ci-linux.yml

@@ -0,0 +1,192 @@
+name: CI Linux
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build-ubuntu-default:
+  # checking pure lib source distribution with plain configure & make
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: configure
+      run: ./configure
+    - name: make
+      run: make
+
+  ubuntu-default-full-bundle-1:
+  # full bundle: enable all codecs + AEC + DTLS
+  # full bundle 1: running pjlib, pjlib-util, pjmedia, and pjsua tests
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y swig sip-tester libopencore-amrnb-dev
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g -fPIC" CXXFLAGS="-g -fPIC" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+    - name: set up Python 3.10 for pjsua test
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.10'
+    - name: unit tests
+      run: make pjlib-test-ci pjlib-util-test pjmedia-test pjsua-test
+
+  ubuntu-default-full-bundle-2:
+  # full bundle 2: running pjnath test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y libopencore-amrnb-dev
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: unit tests
+      run: make pjnath-test
+
+  ubuntu-default-full-bundle-3:
+  # full bundle 3: running pjsip test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y libopencore-amrnb-dev
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: unit tests
+      run: make pjsip-test
+
+  build-ubuntu-no-tls:
+  # no TLS
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y swig
+    - name: configure
+      run: CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --disable-ssl
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  # build-ubuntu-openssl
+  # TLS: with OpenSSL (same as build-ubuntu-default)
+
+  build-ubuntu-gnu-tls:
+  # TLS: with GnuTLS
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get update && sudo apt-get install -y --fix-missing swig libgnutls28-dev
+    - name: configure
+      run: CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --with-gnutls=/usr/
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  ubuntu-video-openh264-1:
+  # video: video enabled with vpx and openh264
+  # video 1: running pjlib, pjlib-util, pjmedia, and pjsua tests
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y swig nasm sip-tester libvpx-dev libopencore-amrnb-dev
+    - name: get openh264
+      run: git clone --single-branch --branch openh264v2.1.0 https://github.com/cisco/openh264.git
+    - name: build openh264
+      run: cd openh264 && make && sudo make install && sudo ldconfig
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g -fPIC -DHAS_VID_CODEC_TEST=0" CXXFLAGS="-g -fPIC" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+    - name: set up Python 3.10 for pjsua test
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: unit tests
+      run: make pjlib-test-ci pjlib-util-test pjmedia-test pjsua-test
+
+  ubuntu-video-openh264-2:
+  # video 2: running pjnath test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y nasm libvpx-dev libopencore-amrnb-dev
+    - name: get openh264
+      run: git clone --single-branch --branch openh264v2.1.0 https://github.com/cisco/openh264.git
+    - name: build openh264
+      run: cd openh264 && make && sudo make install && sudo ldconfig
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: unit tests
+      run: make pjnath-test
+
+  ubuntu-video-openh264-3:
+  # video: 3: running pjsip test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y nasm libvpx-dev libopencore-amrnb-dev
+    - name: get openh264
+      run: git clone --single-branch --branch openh264v2.1.0 https://github.com/cisco/openh264.git
+    - name: build openh264
+      run: cd openh264 && make && sudo make install && sudo ldconfig
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: unit tests
+      run: make pjsip-test
+
+  build-ubuntu-video-ffmpeg:
+  # video enabled with vpx and ffmpeg and x264
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y swig nasm libx264-dev libvpx-dev
+    - name: get ffmpeg
+      run: git clone --single-branch --branch release/4.2 https://github.com/FFmpeg/FFmpeg.git
+    - name: configure ffmpeg
+      run: cd FFmpeg && ./configure --enable-shared --disable-static --enable-gpl --enable-libx264
+    - name: build ffmpeg
+      run: cd FFmpeg && make -j10 && sudo make install
+    - name: config site
+      run: echo -e "#define PJMEDIA_HAS_VIDEO 1\n" > pjlib/include/pj/config_site.h
+    - name: configure
+      run: CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make

.github/workflows/ci-mac.yml

@@ -0,0 +1,224 @@
+name: CI Mac
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build-mac-default:
+  # checking pure lib source distribution with plain configure & make
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: configure
+      run: ./configure
+    - name: make
+      run: make
+
+  mac-default-full-bundle-1:
+  # full bundle: enable all codecs + AEC + DTLS
+  # full bundle 1: running pjlib, pjlib-util, pjmedia, and pjsua tests
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl opencore-amr swig sipp
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g $(pkg-config --cflags openssl) $(pkg-config --cflags opencore-amrnb) -fPIC" LDFLAGS="$(pkg-config --libs-only-L openssl) $(pkg-config --libs-only-L openssl)/lib $(pkg-config --libs-only-L opencore-amrnb)" CXXFLAGS="-g -fPIC" ./configure
+    - name: make
+      run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: unit tests
+      run: make pjlib-test-ci pjmedia-test pjlib-util-test pjsua-test
+
+  mac-default-full-bundle-2:
+  # full bundle 2: running pjnath test
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl opencore-amr
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g $(pkg-config --cflags openssl) $(pkg-config --cflags opencore-amrnb)" LDFLAGS="$(pkg-config --libs-only-L openssl) $(pkg-config --libs-only-L openssl)/lib $(pkg-config --libs-only-L opencore-amrnb)" ./configure
+    - name: make
+      run: make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: unit tests
+      run: make pjnath-test
+
+  mac-default-full-bundle-3:
+  # full bundle 3: running pjsip test
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl opencore-amr
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g $(pkg-config --cflags openssl) $(pkg-config --cflags opencore-amrnb)" LDFLAGS="$(pkg-config --libs-only-L openssl) $(pkg-config --libs-only-L openssl)/lib $(pkg-config --libs-only-L opencore-amrnb)" ./configure
+    - name: make
+      run: make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: unit tests
+      run: make pjsip-test
+
+  # build-ubuntu-no-tls:
+  # no TLS (same as build-mac-default)
+
+  build-mac-openssl:
+  # TLS: with OpenSSL
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl swig
+    - name: configure
+      run: CFLAGS="$(pkg-config --cflags openssl) -fPIC" LDFLAGS="$(pkg-config --libs-only-L openssl) $(pkg-config --libs-only-L openssl)/lib" CXXFLAGS="-fPIC" ./configure
+    - name: make
+      run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  build-mac-gnu-tls:
+  # TLS: with GnuTLS
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install swig
+    - name: configure
+      run: CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --with-gnutls=/usr/local/
+    - name: make
+      run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  mac-video-openh264-1:
+  # video: video enabled with vpx and openh264
+  # video 1: running pjlib, pjlib-util, pjmedia, and pjsua tests
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl openh264 libvpx opencore-amr swig sipp 
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g $(pkg-config --cflags openssl) $(pkg-config --cflags opencore-amrnb) -DHAS_VID_CODEC_TEST=0 -fPIC" LDFLAGS="$(pkg-config --libs-only-L openssl) $(pkg-config --libs-only-L openssl)/lib $(pkg-config --libs-only-L opencore-amrnb)" CXXFLAGS="-g -fPIC" ./configure
+    - name: make
+      run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: unit tests
+      run: make pjlib-test-ci pjmedia-test pjlib-util-test pjsua-test
+
+  mac-video-openh264-2:
+  # video 2: running pjnath test
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl openh264 libvpx opencore-amr
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g $(pkg-config --cflags openssl) $(pkg-config --cflags opencore-amrnb)" LDFLAGS="$(pkg-config --libs-only-L openssl) $(pkg-config --libs-only-L openssl)/lib $(pkg-config --libs-only-L opencore-amrnb)" ./configure
+    - name: make
+      run: make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: unit tests
+      run: make pjnath-test
+
+  mac-video-openh264-3:
+  # video 3: running pjsip test
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl openh264 libvpx opencore-amr
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g $(pkg-config --cflags openssl) $(pkg-config --cflags opencore-amrnb)" LDFLAGS="$(pkg-config --libs-only-L openssl) $(pkg-config --libs-only-L openssl)/lib $(pkg-config --libs-only-L opencore-amrnb)" ./configure
+    - name: make
+      run: make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: unit tests
+      run: make pjsip-test
+
+  build-mac-video-ffmpeg:
+  # video enabled with vpx and ffmpeg and x264
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl x264 libvpx nasm swig
+    - name: get ffmpeg
+      run: git clone --single-branch --branch release/7.0 https://github.com/FFmpeg/FFmpeg.git
+    - name: configure ffmpeg
+      run: cd FFmpeg && LDFLAGS="-Wl,-ld_classic" ./configure --enable-shared --disable-static --enable-gpl --enable-libx264
+    - name: build ffmpeg
+      run: cd FFmpeg && make -j10 && sudo make install
+    - name: config site
+      run: echo -e "#define PJMEDIA_HAS_VIDEO 1\n" > pjlib/include/pj/config_site.h
+    - name: configure
+      run: CFLAGS="$(pkg-config --cflags openssl) -fPIC" LDFLAGS="$(pkg-config --libs-only-L openssl) $(pkg-config --libs-only-L openssl)/lib" CXXFLAGS="-fPIC" ./configure
+    - name: make
+      run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  build-mac-video-vid-toolbox:
+  # video enabled with vpx and video toolbox
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl libvpx swig
+    - name: config site
+      run: echo -e "#define PJMEDIA_HAS_VIDEO 1\n#define PJMEDIA_HAS_VID_TOOLBOX_CODEC 1\n" > pjlib/include/pj/config_site.h
+    - name: configure
+      run: CFLAGS="$(pkg-config --cflags openssl) -fPIC" LDFLAGS="$(pkg-config --libs-only-L openssl) $(pkg-config --libs-only-L openssl)/lib" CXXFLAGS="-fPIC" ./configure
+    - name: make
+      run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make

.github/workflows/ci-win.yml

@@ -0,0 +1,321 @@
+name: CI Windows
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build-windows-default:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get swig
+      run: Invoke-WebRequest -Uri "https://github.com/pjsip/third_party_libs/raw/main/swigwin-4.1.1.zip"  -OutFile ".\swigwin.zip"
+      shell: powershell
+    - name: expand swig
+      run: |
+        Expand-Archive -LiteralPath .\swigwin.zip -DestinationPath .\swigwin\; pwd
+        cd swigwin\swigwin-4.1.1
+        Add-Content ..\..\swig_path.txt $pwd.Path
+      shell: powershell
+    - name: config site
+      run:
+        type nul > pjlib/include/pj/config_site.h
+      shell: cmd
+    - name: MSBuild
+      run: |
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Debug /p:Platform=win32
+      shell: cmd
+    - name: build swig
+      run: |
+        set /P SWIG_PATH=<swig_path.txt
+        set PATH=%PATH%;%SWIG_PATH%
+        dir pjlib/include/pj/config_site.h
+        type pjlib/include/pj/config_site.h
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%JAVA_HOME%\include;%JAVA_HOME%\include\win32
+        cd pjsip-apps/build
+        msbuild swig_java_pjsua2.vcxproj /p:PlatformToolset=v143 /p:Configuration=Debug /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+
+  windows-with-openssl-unit-test-1:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get openssl
+      run: Invoke-WebRequest -Uri "https://github.com/pjsip/third_party_libs/raw/main/openssl-1.1.1s-win.zip" -OutFile ".\openssl.zip"
+      shell: powershell
+    - name: expand openssl
+      run: |
+        Expand-Archive -LiteralPath .\openssl.zip -DestinationPath .;
+        cd openssl_build
+        Add-Content ..\openssl_dir.txt $pwd.Path
+      shell: powershell
+    - name: check openssl folder
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        dir %OPENSSL_DIR%\include
+        dir %OPENSSL_DIR%\lib
+      shell: cmd
+    - name: config site
+      run:
+        cd pjlib/include/pj; cp config_site_test.h config_site.h; Add-Content config_site.h "#define PJ_HAS_SSL_SOCK 1"
+      shell: powershell
+    - name: check VsDevCmd.bat
+      run: dir "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+      shell: cmd
+    - name: MSBuild
+      working-directory: .
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%OPENSSL_DIR%\include
+        set LIB=%LIB%;%OPENSSL_DIR%\lib
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+    - name: unit tests
+      run: |
+        $env:OPENSSL_DIR = Get-Content .\openssl_dir.txt
+        $env:PATH+=";$env:OPENSSL_DIR\bin"
+        cd pjlib/bin; ./pjlib-test-i386-Win32-vc14-Release.exe --ci-mode
+        cd ../../pjlib-util/bin; ./pjlib-util-test-i386-Win32-vc14-Release.exe
+        cd ../../pjmedia/bin/; ./pjmedia-test-i386-Win32-vc14-Release.exe
+      shell: powershell
+
+  windows-with-openssl-unit-test-2:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get openssl
+      run: Invoke-WebRequest -Uri "https://github.com/pjsip/third_party_libs/raw/main/openssl-1.1.1s-win.zip" -OutFile ".\openssl.zip"
+      shell: powershell
+    - name: expand openssl
+      run: |
+        Expand-Archive -LiteralPath .\openssl.zip -DestinationPath .; pwd
+        cd openssl_build
+        Add-Content ..\openssl_dir.txt $pwd.Path
+      shell: powershell
+    - name: check openssl folder
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        dir "%OPENSSL_DIR%\include"
+        dir "%OPENSSL_DIR%\lib"
+      shell: cmd
+    - name: config site
+      run:
+        cd pjlib/include/pj; cp config_site_test.h config_site.h; Add-Content config_site.h "#define PJ_HAS_SSL_SOCK 1"
+      shell: powershell
+    - name: check VsDevCmd.bat
+      run: dir "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+      shell: cmd
+    - name: MSBuild
+      working-directory: .
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%OPENSSL_DIR%\include
+        set LIB=%LIB%;%OPENSSL_DIR%\lib
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+    - name: build test tools cmp_wav
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        cd tests/pjsua/tools
+        set INCLUDE=%INCLUDE%;%OPENSSL_DIR%\include
+        set LIB=%LIB%;%OPENSSL_DIR%\lib
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        msbuild cmp_wav.vcxproj /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+    - name: set up Python 3.10 for pjsua test
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: unit tests
+      run: |
+        $env:OPENSSL_DIR = Get-Content .\openssl_dir.txt
+        $env:PATH+=";$env:OPENSSL_DIR\bin"
+        cd tests/pjsua; python runall.py
+        cd ../../pjsip/bin; ./pjsip-test-i386-Win32-vc14-Release.exe
+      shell: powershell
+
+  build-windows-gnu-tls:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get gnutls
+      run: Invoke-WebRequest -Uri "https://github.com/pjsip/third_party_libs/raw/main/gnutls-3.5.17-win.zip" -Outfile ".\gnutls.zip"
+      shell: powershell
+    - name: expand gnutls
+      run: |
+        Expand-Archive -LiteralPath .\gnutls.zip -DestinationPath .; pwd
+        cd gnutls_build
+        Add-Content ..\gnutls_dir.txt $pwd.Path
+      shell: powershell
+    - name: check gnutls folder
+      run: |
+        set /P GNUTLS_DIR=<gnutls_dir.txt
+        dir "%GNUTLS_DIR%\include"
+        dir "%GNUTLS_DIR%\lib\"
+      shell: cmd
+    - name: config site
+      run: |
+        echo "" > pjlib\include\pj\config_site.h
+        Add-Content config_site.h "#define PJ_HAS_SSL_SOCK 1"
+        Add-Content config_site.h "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS"
+      shell: powershell
+    - name: check VsDevCmd.bat
+      run: dir "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+      shell: cmd
+    - name: MSBuild
+      working-directory: .
+      run: |
+        set /P GNUTLS_DIR=<gnutls_dir.txt
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%GNUTLS_DIR%\include
+        set LIB=%LIB%;%GNUTLS_DIR%\lib
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+
+  windows-with-video-libvpx-schannel-unit-test-1:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get vpx
+      run: Invoke-WebRequest -Uri "https://github.com/pjsip/third_party_libs/raw/main/vpx-1.12-win.zip" -Outfile "vpx.zip"
+      shell: powershell
+    - name: expand libvpx
+      run: |
+        Expand-Archive -LiteralPath .\vpx.zip -DestinationPath .; pwd
+        cd vpx_build
+        Add-Content ..\vpx_dir.txt $pwd.Path
+      shell: powershell
+    - name: check vpx folder
+      run: |
+        set /P VPX_DIR=<vpx_dir.txt
+        dir "%VPX_DIR%\include"
+        dir "%VPX_DIR%\lib"
+      shell: cmd
+    - name: get sdl
+      run: Invoke-WebRequest -Uri "https://github.com/libsdl-org/SDL/releases/download/release-2.26.2/SDL2-devel-2.26.2-VC.zip" -Outfile ".\sdl.zip"
+      shell: powershell
+    - name: expand sdl
+      run: |
+        Expand-Archive -LiteralPath .\sdl.zip -DestinationPath .\sdl_build\; pwd
+        cd sdl_build\SDL2-2.26.2
+        Add-Content ..\..\sdl_dir.txt $pwd.Path
+      shell: powershell
+    - name: check sdl folder
+      run: |
+        set /P SDL_DIR=<sdl_dir.txt
+        dir "%SDL_DIR%\include"
+        dir "%SDL_DIR%\lib\x86"
+      shell: cmd
+    - name: config site
+      run: |
+        cd pjlib/include/pj; cp config_site_test.h config_site.h
+        Add-Content config_site.h "#define PJ_HAS_SSL_SOCK 1"
+        Add-Content config_site.h "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_SCHANNEL"
+        Add-Content config_site.h "#undef PJMEDIA_SRTP_HAS_DTLS"
+        Add-Content config_site.h "#define PJMEDIA_HAS_VIDEO 1"
+        Add-Content config_site.h "#define PJMEDIA_VIDEO_DEV_HAS_DSHOW 1"
+        Add-Content config_site.h "#define PJMEDIA_HAS_LIBYUV 1"
+        Add-Content config_site.h "#define PJMEDIA_VIDEO_DEV_HAS_SDL 1"
+        Add-Content config_site.h "#define PJMEDIA_HAS_VPX_CODEC 1"
+      shell: powershell
+    - name: check VsDevCmd.bat
+      run: dir "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+      shell: cmd
+    - name: MSBuild
+      working-directory: .
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        set /P VPX_DIR=<vpx_dir.txt
+        set /P SDL_DIR=<sdl_dir.txt
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%OPENSSL_DIR%\include;%VPX_DIR%\include;%SDL_DIR%\include
+        set LIB=%LIB%;%OPENSSL_DIR%\lib;%VPX_DIR%\lib;%SDL_DIR%\lib\x86
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+    - name: build test tools cmp_wav
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        set /P VPX_DIR=<vpx_dir.txt
+        set /P SDL_DIR=<sdl_dir.txt
+        cd tests/pjsua/tools
+        set INCLUDE=%INCLUDE%;%OPENSSL_DIR%\include;%VPX_DIR%\include;%SDL_DIR%\include
+        set LIB=%LIB%;%VPX_DIR%\lib;%SDL_DIR%\lib\x86
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        msbuild cmp_wav.vcxproj /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+    - name: set up Python 3.10 for pjsua test
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: unit tests
+      run: |
+        $env:SDL_DIR = Get-Content .\sdl_dir.txt
+        $env:PATH+=";$env:SDL_DIR\lib\x86;"
+        cd tests/pjsua; python runall.py
+        cd ../../pjlib/bin; ./pjlib-test-i386-Win32-vc14-Release.exe --ci-mode
+        cd ../../pjlib-util/bin; ./pjlib-util-test-i386-Win32-vc14-Release.exe
+        cd ../../pjmedia/bin/; ./pjmedia-test-i386-Win32-vc14-Release.exe
+      shell: powershell
+
+  build-windows-video-ffmpeg:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get ffmpeg
+      run: Invoke-WebRequest -Uri "https://github.com/pjsip/third_party_libs/raw/main/ffmpeg-5.1.2-win.zip" -Outfile "ffmpeg.zip"
+      shell: powershell
+    - name: expand ffmpeg
+      run: |
+        Expand-Archive -LiteralPath .\ffmpeg.zip -DestinationPath .; pwd
+        cd ffmpeg_build
+        Add-Content ..\ffmpeg_dir.txt $pwd.Path
+      shell: powershell
+    - name: check ffmpeg folder
+      run: |
+        set /P FFMPEG_DIR=<ffmpeg_dir.txt
+        dir "%FFMPEG_DIR%\include"
+        dir "%FFMPEG_DIR%\lib"
+      shell: cmd
+    - name: get sdl
+      run: Invoke-WebRequest -Uri "https://github.com/libsdl-org/SDL/releases/download/release-2.26.2/SDL2-devel-2.26.2-VC.zip" -Outfile ".\sdl.zip"
+      shell: powershell
+    - name: expand sdl
+      run: |
+        Expand-Archive -LiteralPath .\sdl.zip -DestinationPath .\sdl_build\; pwd
+        cd sdl_build\SDL2-2.26.2
+        Add-Content ..\..\sdl_dir.txt $pwd.Path
+      shell: powershell
+    - name: check sdl folder
+      run: |
+        set /P SDL_DIR=<sdl_dir.txt
+        dir "%SDL_DIR%\include\SDL"
+        dir "%SDL_DIR%\lib\x86"
+      shell: cmd
+    - name: config site
+      run: |
+        echo "" > pjlib\include\pj\config_site.h
+        Add-Content config_site.h "#define PJMEDIA_HAS_VIDEO 1"
+        Add-Content config_site.h "#define PJMEDIA_HAS_FFMPEG 1"
+        Add-Content config_site.h "#define PJMEDIA_HAS_FFMPEG_VID_CODEC 1"
+        Add-Content config_site.h "#define PJMEDIA_VIDEO_DEV_HAS_FFMPEG 1"
+        Add-Content config_site.h "#define PJMEDIA_VIDEO_DEV_HAS_SDL 1"
+      shell: powershell
+    - name: check VsDevCmd.bat
+      run: dir "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+      shell: cmd
+    - name: MSBuild
+      working-directory: .
+      run: |
+        set /P FFMPEG_DIR=<ffmpeg_dir.txt        
+        set /P LIBSDL_DIR=<sdl_dir.txt
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%LIBFFMPEG_DIR%\include;%SDL_DIR%\include
+        set LIB=%LIB%;%FFMPEG_DIR%\lib;%SDL_DIR%\lib\x86
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd

.github/workflows/cifuzz.yml

@@ -0,0 +1,32 @@
+name: CIFuzz
+on: [pull_request]
+jobs:
+  Fuzzing:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sanitizer: [address, undefined, memory]
+    steps:
+    - name: Build Fuzzers (${{ matrix.sanitizer }})
+      id: build
+      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'pjsip'
+        dry-run: false
+        language: c
+        sanitizer: ${{ matrix.sanitizer }}
+    - name: Run Fuzzers (${{ matrix.sanitizer }})
+      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'pjsip'
+        dry-run: false
+        language: c
+        fuzz-seconds: 300
+        sanitizer: ${{ matrix.sanitizer }}
+    - name: Upload Crash
+      uses: actions/upload-artifact@v1
+      if: failure() && steps.build.outcome == 'success'
+      with:
+        name: ${{ matrix.sanitizer }}-artifacts
+        path: ./out/artifacts

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,66 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 22 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['cpp', 'python']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file. 
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    # - name: Autobuild
+    #   uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+    - run: |
+       ./configure --disable-libyuv --disable-libwebrtc --disable-speex-codec --disable-speex-aec
+       make
+       mv tests/pjsua/inc_cfg.py tests/pjsua/inc_cfg.txt
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/coverity-scan-daily.yml

@@ -0,0 +1,19 @@
+# Scheduled scan, only runs on master (see
+# https://stackoverflow.com/a/58800550)
+
+name: "Coverity Scan (Daily)"
+
+on:
+  schedule:
+    - cron: '0 12 * * *'   # Daily at 12:00 UTC
+
+jobs:
+  ubuntu-full-bundle:
+    if: github.repository == 'pjsip/pjproject'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: run.sh
+        run: tests/coverity-scan/run.sh
+        env:
+          COV_TOKEN: ${{ secrets.PJSIP_COVERITY_SCAN_TOKEN }}

.github/workflows/coverity-scan-manual.yml

@@ -0,0 +1,16 @@
+# This allows running coverity scan at any time and on any branch. Invoke this
+# action manually from https://github.com/pjsip/pjproject/actions
+
+name: "Coverity Scan (Manual)"
+
+on: [workflow_dispatch]
+
+jobs:
+  ubuntu-full-bundle:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: run.sh
+        run: tests/coverity-scan/run.sh
+        env:
+          COV_TOKEN: ${{ secrets.PJSIP_COVERITY_SCAN_TOKEN }}

.gitignore

@@ -0,0 +1,88 @@
+pjlib/include/pj/config_site.h
+lib/
+bin/
+output/
+tmp/
+
+# VS stuff
+*.ncb
+*.suo
+*.cache
+*.resw
+.vs/
+.vscode/
+**/build/**/*.vcproj.*.user
+**/build/**/*.vcxproj.*.user
+**/build/**/*.vcproj.user
+**/build/**/*.vcxproj.user
+**/Win32/Debug
+**/x64/Debug
+**/x86/Debug
+UpgradeLog*.htm
+# VS 2015 stuff
+*.pdb
+*.db
+*.opendb
+samples.log
+
+# GNU stuff
+config.log
+config.status
+build.mak
+user.mak
+cc-auto.mak
+os-auto.mak
+m_auto.h
+os_auto.h
+config_auto.h
+sip_autoconf.h
+*.depend
+
+# Apple stuff
+*.DS_Store
+autom4te.cache
+xcuserdata
+pjsip-apps/src/pjsua/ios*/lib*.a
+pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.xcworkspace/
+pjsip-apps/src/pjsua/ios/ipjsua.xcworkspace/xcshareddata
+pjsip-apps/src/pjsua/ios-swift/Libraries/
+pjsip-apps/src/pjsua2/ios-swift-pjsua2/Libraries/
+
+# SWIG Java/Android stuff
+pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/*.java
+pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/PjCamera*.java
+pjsip-apps/src/swig/java/android/app/src/main/jniLibs/
+
+# SWIG CSharp/Xamarin stuff
+pjsip-apps/src/swig/csharp/pjsua2xamarin/
+
+# SWIG Python stuff
+pjsip-apps/src/swig/python/build/
+pjsip-apps/src/swig/python/pjsua2.py
+pjsip-apps/src/swig/python/pjsua2_wrap.*
+
+# unit tests files
+tests/pjsua/*.pyc
+tests/pjsua/scripts-*/*.pyc
+tests/pjsua/*.log
+tests/pjsua/wavs/tmp*.wav
+tests/pjsua/tools/cmp_wav
+tests/pjsua/tools/cmp_wav.dSYM
+tests/pjsua/logs
+tests/fuzz/*
+!tests/fuzz/**/
+!tests/fuzz/*.*
+tests/fuzz/*.o
+# benchmark output
+*bench*.htm
+
+# Doxygen stuff
+*/docs/html/
+*/docs/xml/
+*/docs/latex/
+*/docs/*.tag
+
+# Coverity scan stuff
+cov-int/
+getversion.mak
+configure.out

COPYING

@@ -1,352 +1,339 @@
-                      GNU GENERAL PUBLIC LICENSE
-                         Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-     Everyone is permitted to copy and distribute verbatim copies
-     of this license document, but changing it is not allowed.
+                            Preamble
 
-Preamble
-========
-
-The licenses for most software are designed to take away your freedom
-to share and change it.  By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
 software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
-When we speak of free software, we are referring to freedom, not price.
-Our General Public Licenses are designed to make sure that you have
-the freedom to distribute copies of free software (and charge for this
-service if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs; and that you know you can do these things.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-To protect your rights, we need to make restrictions that forbid anyone
-to deny you these rights or to ask you to surrender the rights.  These
-restrictions translate to certain responsibilities for you if you
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
 distribute copies of the software, or if you modify it.
 
-For example, if you distribute copies of such a program, whether gratis
-or for a fee, you must give the recipients all the rights that you
-have.  You must make sure that they, too, receive or can get the source
-code.  And you must show them these terms so they know their rights.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
 
-We protect your rights with two steps: (1) copyright the software, and
+  We protect your rights with two steps: (1) copyright the software, and
 (2) offer you this license which gives you legal permission to copy,
 distribute and/or modify the software.
 
-Also, for each author's protection and ours, we want to make certain
+  Also, for each author's protection and ours, we want to make certain
 that everyone understands that there is no warranty for this free
 software.  If the software is modified by someone else and passed on, we
 want its recipients to know that what they have is not the original, so
 that any problems introduced by others will not reflect on the original
 authors' reputations.
 
-Finally, any free program is threatened constantly by software patents.
-We wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program
-proprietary.  To prevent this, we have made it clear that any patent
-must be licensed for everyone's free use or not licensed at all.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
-The precise terms and conditions for copying, distribution and
+  The precise terms and conditions for copying, distribution and
 modification follow.
 
-                      GNU GENERAL PUBLIC LICENSE
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  0. This License applies to any program or other work which contains a
-     notice placed by the copyright holder saying it may be distributed
-     under the terms of this General Public License.  The "Program",
-     below, refers to any such program or work, and a "work based on
-     the Program" means either the Program or any derivative work under
-     copyright law: that is to say, a work containing the Program or a
-     portion of it, either verbatim or with modifications and/or
-     translated into another language.  (Hereinafter, translation is
-     included without limitation in the term "modification".)  Each
-     licensee is addressed as "you".
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-     Activities other than copying, distribution and modification are
-     not covered by this License; they are outside its scope.  The act
-     of running the Program is not restricted, and the output from the
-     Program is covered only if its contents constitute a work based on
-     the Program (independent of having been made by running the
-     Program).  Whether that is true depends on what the Program does.
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
 
   1. You may copy and distribute verbatim copies of the Program's
-     source code as you receive it, in any medium, provided that you
-     conspicuously and appropriately publish on each copy an appropriate
-     copyright notice and disclaimer of warranty; keep intact all the
-     notices that refer to this License and to the absence of any
-     warranty; and give any other recipients of the Program a copy of
-     this License along with the Program.
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
 
-     You may charge a fee for the physical act of transferring a copy,
-     and you may at your option offer warranty protection in exchange
-     for a fee.
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
 
   2. You may modify your copy or copies of the Program or any portion
-     of it, thus forming a work based on the Program, and copy and
-     distribute such modifications or work under the terms of Section 1
-     above, provided that you also meet all of these conditions:
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
 
-       a. You must cause the modified files to carry prominent notices
-          stating that you changed the files and the date of any change.
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
 
-       b. You must cause any work that you distribute or publish, that
-          in whole or in part contains or is derived from the Program
-          or any part thereof, to be licensed as a whole at no charge
-          to all third parties under the terms of this License.
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
 
-       c. If the modified program normally reads commands interactively
-          when run, you must cause it, when started running for such
-          interactive use in the most ordinary way, to print or display
-          an announcement including an appropriate copyright notice and
-          a notice that there is no warranty (or else, saying that you
-          provide a warranty) and that users may redistribute the
-          program under these conditions, and telling the user how to
-          view a copy of this License.  (Exception: if the Program
-          itself is interactive but does not normally print such an
-          announcement, your work based on the Program is not required
-          to print an announcement.)
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
 
-     These requirements apply to the modified work as a whole.  If
-     identifiable sections of that work are not derived from the
-     Program, and can be reasonably considered independent and separate
-     works in themselves, then this License, and its terms, do not
-     apply to those sections when you distribute them as separate
-     works.  But when you distribute the same sections as part of a
-     whole which is a work based on the Program, the distribution of
-     the whole must be on the terms of this License, whose permissions
-     for other licensees extend to the entire whole, and thus to each
-     and every part regardless of who wrote it.
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
 
-     Thus, it is not the intent of this section to claim rights or
-     contest your rights to work written entirely by you; rather, the
-     intent is to exercise the right to control the distribution of
-     derivative or collective works based on the Program.
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
 
-     In addition, mere aggregation of another work not based on the
-     Program with the Program (or with a work based on the Program) on
-     a volume of a storage or distribution medium does not bring the
-     other work under the scope of this License.
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
 
   3. You may copy and distribute the Program (or a work based on it,
-     under Section 2) in object code or executable form under the terms
-     of Sections 1 and 2 above provided that you also do one of the
-     following:
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
 
-       a. Accompany it with the complete corresponding machine-readable
-          source code, which must be distributed under the terms of
-          Sections 1 and 2 above on a medium customarily used for
-          software interchange; or,
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
 
-       b. Accompany it with a written offer, valid for at least three
-          years, to give any third-party, for a charge no more than your
-          cost of physically performing source distribution, a complete
-          machine-readable copy of the corresponding source code, to be
-          distributed under the terms of Sections 1 and 2 above on a
-          medium customarily used for software interchange; or,
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
 
-       c. Accompany it with the information you received as to the offer
-          to distribute corresponding source code.  (This alternative is
-          allowed only for noncommercial distribution and only if you
-          received the program in object code or executable form with
-          such an offer, in accord with Subsection b above.)
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
 
-     The source code for a work means the preferred form of the work for
-     making modifications to it.  For an executable work, complete
-     source code means all the source code for all modules it contains,
-     plus any associated interface definition files, plus the scripts
-     used to control compilation and installation of the executable.
-     However, as a special exception, the source code distributed need
-     not include anything that is normally distributed (in either
-     source or binary form) with the major components (compiler,
-     kernel, and so on) of the operating system on which the executable
-     runs, unless that component itself accompanies the executable.
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
 
-     If distribution of executable or object code is made by offering
-     access to copy from a designated place, then offering equivalent
-     access to copy the source code from the same place counts as
-     distribution of the source code, even though third parties are not
-     compelled to copy the source along with the object code.
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
 
   4. You may not copy, modify, sublicense, or distribute the Program
-     except as expressly provided under this License.  Any attempt
-     otherwise to copy, modify, sublicense or distribute the Program is
-     void, and will automatically terminate your rights under this
-     License.  However, parties who have received copies, or rights,
-     from you under this License will not have their licenses
-     terminated so long as such parties remain in full compliance.
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
 
   5. You are not required to accept this License, since you have not
-     signed it.  However, nothing else grants you permission to modify
-     or distribute the Program or its derivative works.  These actions
-     are prohibited by law if you do not accept this License.
-     Therefore, by modifying or distributing the Program (or any work
-     based on the Program), you indicate your acceptance of this
-     License to do so, and all its terms and conditions for copying,
-     distributing or modifying the Program or works based on it.
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
 
   6. Each time you redistribute the Program (or any work based on the
-     Program), the recipient automatically receives a license from the
-     original licensor to copy, distribute or modify the Program
-     subject to these terms and conditions.  You may not impose any
-     further restrictions on the recipients' exercise of the rights
-     granted herein.  You are not responsible for enforcing compliance
-     by third parties to this License.
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
 
   7. If, as a consequence of a court judgment or allegation of patent
-     infringement or for any other reason (not limited to patent
-     issues), conditions are imposed on you (whether by court order,
-     agreement or otherwise) that contradict the conditions of this
-     License, they do not excuse you from the conditions of this
-     License.  If you cannot distribute so as to satisfy simultaneously
-     your obligations under this License and any other pertinent
-     obligations, then as a consequence you may not distribute the
-     Program at all.  For example, if a patent license would not permit
-     royalty-free redistribution of the Program by all those who
-     receive copies directly or indirectly through you, then the only
-     way you could satisfy both it and this License would be to refrain
-     entirely from distribution of the Program.
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
 
-     If any portion of this section is held invalid or unenforceable
-     under any particular circumstance, the balance of the section is
-     intended to apply and the section as a whole is intended to apply
-     in other circumstances.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
 
-     It is not the purpose of this section to induce you to infringe any
-     patents or other property right claims or to contest validity of
-     any such claims; this section has the sole purpose of protecting
-     the integrity of the free software distribution system, which is
-     implemented by public license practices.  Many people have made
-     generous contributions to the wide range of software distributed
-     through that system in reliance on consistent application of that
-     system; it is up to the author/donor to decide if he or she is
-     willing to distribute software through any other system and a
-     licensee cannot impose that choice.
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
 
-     This section is intended to make thoroughly clear what is believed
-     to be a consequence of the rest of this License.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
 
   8. If the distribution and/or use of the Program is restricted in
-     certain countries either by patents or by copyrighted interfaces,
-     the original copyright holder who places the Program under this
-     License may add an explicit geographical distribution limitation
-     excluding those countries, so that distribution is permitted only
-     in or among countries not thus excluded.  In such case, this
-     License incorporates the limitation as if written in the body of
-     this License.
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
 
-  9. The Free Software Foundation may publish revised and/or new
-     versions of the General Public License from time to time.  Such
-     new versions will be similar in spirit to the present version, but
-     may differ in detail to address new problems or concerns.
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
 
-     Each version is given a distinguishing version number.  If the
-     Program specifies a version number of this License which applies
-     to it and "any later version", you have the option of following
-     the terms and conditions either of that version or of any later
-     version published by the Free Software Foundation.  If the Program
-     does not specify a version number of this License, you may choose
-     any version ever published by the Free Software Foundation.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
 
- 10. If you wish to incorporate parts of the Program into other free
-     programs whose distribution conditions are different, write to the
-     author to ask for permission.  For software which is copyrighted
-     by the Free Software Foundation, write to the Free Software
-     Foundation; we sometimes make exceptions for this.  Our decision
-     will be guided by the two goals of preserving the free status of
-     all derivatives of our free software and of promoting the sharing
-     and reuse of software generally.
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
 
-                                NO WARRANTY
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
-     WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
-     LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-     HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
-     WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
-     NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-     FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE
-     QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-     PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
-     SERVICING, REPAIR OR CORRECTION.
+                            NO WARRANTY
 
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-     WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
-     MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
-     LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
-     INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-     INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-     DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
-     OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
-     OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
 
-                      END OF TERMS AND CONDITIONS
-How to Apply These Terms to Your New Programs
-=============================================
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
 
-If you develop a new program, and you want it to be of the greatest
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
+free software which everyone can redistribute and change under these terms.
 
-To do so, attach the following notices to the program.  It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
 
-     ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
-     Copyright (C) YYYY  NAME OF AUTHOR
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; either version 2 of the License, or
-     (at your option) any later version.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-     You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-     Gnomovision version 69, Copyright (C) 19YY NAME OF AUTHOR
-     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-     This is free software, and you are welcome to redistribute it
-     under certain conditions; type `show c' for details.
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
 
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-program.
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
 
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  Here is a sample; alter the names:
 
-     Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-     `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-     SIGNATURE OF TY COON, 1 April 1989
-     Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library,
-you may consider it more useful to permit linking proprietary
-applications with the library.  If this is what you want to do, use the
-GNU Library General Public License instead of this License.
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
 
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

FUZZING.MD

@@ -0,0 +1,33 @@
+### Export Flags
+
+```
+export CC=clang
+export CXX=clang++
+export LIB_FUZZING_ENGINE=-fsanitize=fuzzer
+export CFLAGS="-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=address -fsanitize-address-use-after-scope -fsanitize=fuzzer-no-link"
+export CXXFLAGS="$CFLAGS"
+export LDFLAGS="$CFLAGS"
+```
+
+### Compile Guide
+
+Note: While compiling fuzzing suite, Don't use bloat libraries.
+
+```
+./configure --disable-ffmpeg --disable-ssl --disable-speex-aec --disable-speex-codec --disable-g7221-codec --disable-gsm-codec --disable-ilbc-codec --disable-resample --disable-libsrtp --disable-libwebrtc --disable-libyuv
+
+make dep
+make -j$(nproc)
+make fuzz
+```
+
+
+### Run
+
+```
+cd tests/fuzz
+mkdir cov-json
+unzip seed/fuzz-json_seed_corpus.zip
+./fuzz-json cov-json/ fuzz-json_seed_corpus/
+```
+

INSTALL.txt

@@ -1,48 +0,0 @@
-[Last update: 2007/02/18]
-
--= INTRO=-
-
-This top level projects:
-
- - pjlib:       portability and basic framework library
- - pjlib-util:  lexical scanner, XML, STUN, MD5, DNS, etc.
- - pjmedia:     media framework and codecs
- - pjsip:       SIP stacks (core, UA layer, SIMPLE, etc.)
- - pjsip-apps:  SIP apps (pjsua, pjsip-perf)
-
-
--= COMPILING =-
-
-On Windows:
- - Visual Studio 6: open pjproject.dsw
- - Visual Studio 8/2005: open pjproject-vs8.sln
- - Embedded VisualC 4: open open pjsip-apps\build\wince-evc4\wince_demos.vcw
- - Build pjsua
-
-With Makefile:
- - on top level dir (e.g. ~/pjproject)
- - ./configure && make dep && make clean && make
-
-Binaries will be in pjsip-apps/bin.
-
-
--= PYTHON MODULE =-
-
-On Windows:
- - Visual Studio 6: open pjsip-apps\build\pjsip_apps.dsw
- - Build py_pjsua module
-
-With GNU and Python:
- - cd pjsip-apps/src/py_pjsua
- - python setup.py install
-
-One Python sample application is provided:
- pjsip-apps/src/py_pjsua/pjsua_app.py
- 
- 
--= PORTING =-
-
- - Just need to port pjlib.
- - PJLIB doc has detailed info how to do this.
- - Must pass pjlib-test!
-

Makefile

@@ -1,27 +1,72 @@
 include build.mak
 include build/host-$(HOST_NAME).mak
+-include user.mak
+include version.mak
 
-DIRS = pjlib pjlib-util pjnath third_party pjmedia pjsip pjsip-apps
+LIB_DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build
+DIRS = $(LIB_DIRS) pjsip-apps/build $(EXTRA_DIRS)
 
 ifdef MINSIZE
 MAKE_FLAGS := MINSIZE=1
 endif
 
-all clean dep depend distclean doc print realclean:
+all clean dep depend print:
 	for dir in $(DIRS); do \
-		if $(MAKE) $(MAKE_FLAGS) -C $$dir/build $@; then \
+		if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \
 		    true; \
 		else \
 		    exit 1; \
 		fi; \
 	done
 
+distclean realclean:
+	for dir in $(DIRS); do \
+		if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \
+		    true; \
+		else \
+		    exit 1; \
+		fi; \
+	done
+	$(HOST_RM) config.log
+	$(HOST_RM) config.status
+
+lib:
+	for dir in $(LIB_DIRS); do \
+		if $(MAKE) $(MAKE_FLAGS) -C $$dir lib; then \
+		    true; \
+		else \
+		    exit 1; \
+		fi; \
+	done; \
+
+
+.PHONY: lib doc clean-doc
+
+doc:
+	@if test \( ! "$(WWWDIR)" == "" \) -a \( ! -d $(WWWDIR)/pjlib/docs/html \) ; then \
+		echo 'Directory "$(WWWDIR)" does not look like a valid pjsip web directory'; \
+		exit 1; \
+	fi
+	for dir in $(DIRS); do \
+		if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \
+		    true; \
+		else \
+		    exit 1; \
+		fi; \
+	done
+
+clean-doc:
+	for dir in pjlib pjlib-util pjnath pjmedia pjsip; do \
+		rm -rf $${dir}/docs/$${PJ_VERSION}; \
+	done
+
 LIBS = 	pjlib/lib/libpj-$(TARGET_NAME).a \
 	pjlib-util/lib/libpjlib-util-$(TARGET_NAME).a \
 	pjnath/lib/libpjnath-$(TARGET_NAME).a \
 	pjmedia/lib/libpjmedia-$(TARGET_NAME).a \
+	pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME).a \
 	pjmedia/lib/libpjmedia-codec-$(TARGET_NAME).a \
-       	pjsip/lib/libpjsip-$(TARGET_NAME).a \
+	pjsip/lib/libpjsip-$(TARGET_NAME).a \
 	pjsip/lib/libpjsip-ua-$(TARGET_NAME).a \
 	pjsip/lib/libpjsip-simple-$(TARGET_NAME).a \
 	pjsip/lib/libpjsua-$(TARGET_NAME).a
@@ -56,14 +101,63 @@ xhdrid:
 		cp /tmp/id $$f; \
 	done
 
-prefix = /usr/local
+selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test
+
+pjlib-test: pjlib/bin/pjlib-test-$(TARGET_NAME)
+	cd pjlib/build && ../bin/pjlib-test-$(TARGET_NAME)
+
+pjlib-test-ci: pjlib/bin/pjlib-test-$(TARGET_NAME)
+	cd pjlib/build && ../bin/pjlib-test-$(TARGET_NAME) --ci-mode
+
+pjlib-util-test: pjlib-util/bin/pjlib-util-test-$(TARGET_NAME)
+	cd pjlib-util/build && ../bin/pjlib-util-test-$(TARGET_NAME)
+
+pjnath-test: pjnath/bin/pjnath-test-$(TARGET_NAME)
+	cd pjnath/build && ../bin/pjnath-test-$(TARGET_NAME)
+
+pjmedia-test: pjmedia/bin/pjmedia-test-$(TARGET_NAME)
+	cd pjmedia/build && ../bin/pjmedia-test-$(TARGET_NAME)
+
+pjsip-test: pjsip/bin/pjsip-test-$(TARGET_NAME)
+	cd pjsip/build && ../bin/pjsip-test-$(TARGET_NAME)
+
+pjsua-test: cmp_wav
+	cd tests/pjsua && python runall.py -t 2
+
+cmp_wav:
+	$(MAKE) -C tests/pjsua/tools
+
+fuzz:
+	$(MAKE) -C tests/fuzz
+
 install:
-	mkdir -p $(DESTDIR)$(prefix)/lib
-	cp -L $$(find . -name '*.a') $(DESTDIR)$(prefix)/lib
-	mkdir -p $(DESTDIR)$(prefix)/include
-	cp -RL $$(find  . -name include) $(DESTDIR)$(prefix)
-	cd $(DESTDIR)$(prefix)/lib && for i in $$(find . -name 'libpj*a'); do\
-		ln -s $$i $$(echo $$i | sed -e "s/-$(TARGET_NAME)//");\
+	mkdir -p $(DESTDIR)$(libdir)/
+	if [ "$(PJ_EXCLUDE_PJSUA2)x" = "x" ] ; then \
+	    cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/; \
+	else \
+	    cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/; \
+	fi
+	mkdir -p $(DESTDIR)$(includedir)/
+	for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
+		cp -RLf $$d/include/* $(DESTDIR)$(includedir)/; \
 	done
-	mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
-	sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpj.pc.in > $(DESTDIR)/$(prefix)/lib/pkgconfig/libpj.pc
+	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+	sed -e "s!@PREFIX@!$(prefix)!" libpjproject.pc.in | \
+		sed -e "s!@INCLUDEDIR@!$(includedir)!" | \
+		sed -e "s!@LIBDIR@!$(libdir)!" | \
+		sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \
+		sed -e "s!@PJ_INSTALL_LDFLAGS@!$(PJ_INSTALL_LDFLAGS)!" | \
+		sed -e "s!@PJ_INSTALL_LDFLAGS_PRIVATE@!$(PJ_INSTALL_LDFLAGS_PRIVATE)!" | \
+		sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc
+
+uninstall:
+	$(RM) $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc
+	rmdir $(DESTDIR)$(libdir)/pkgconfig 2> /dev/null || true
+	for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
+		for f in $$d/include/*; do \
+			$(RM) -r "$(DESTDIR)$(includedir)/`basename $$f`"; \
+		done; \
+	done
+	rmdir $(DESTDIR)$(includedir) 2> /dev/null || true
+	$(RM) $(addprefix $(DESTDIR)$(libdir)/,$(notdir $(APP_LIBXX_FILES)))
+	rmdir $(DESTDIR)$(libdir) 2> /dev/null || true

README-RTEMS

@@ -1,87 +0,0 @@
-
-
-
-              Build Instructions for PJLIB/PJMEDIA/PJSIP RTEMS Port
-
-
-
-The RTEMS port uses the POSIX abstraction layer at the moment, and has been 
-tested with RTEMS 4.6 on i386 target.
-
-
-Building RTEMS
----------------
-I use RTEMS 4.6 on a cygwin host with i386/pc386 as target, but I think it 
-should work with different RTEMS versions/hosts/targets. 
-
-RTEMS was built with the following commands:
-
-  $ /opt/src/rtems-4.6.6/configure --enable-cxx --enable-posix --enable-networking --enable-rdbg --enable-tests --enable-rtemsbsp=pc386 --target=i386-rtems
-  $ make
-  $ make install
-
-
-Supported Targets
------------------
-At the moment, pjlib supports i386 and mpc860 CPU target. For other targets, 
-you would need to create/tweak the appropriate "m-xxx.mak" in "build" directory
-and the corresponding "m_xxx.h" header file in "pj/compat" directory.
-
-Please refer to pjlib porting guide about how to port PJLIB to new CPU target.
-
-
-Building PJLIB/PJMEDIA/PJSIP
-----------------------------
-Use the following steps to build the libraries:
-
-
-1. Set RTEMS_LIBRARY_PATH environment variable to point to your BSP directory 
-   (which is <RTEMS INSTALLATION POINT>/<BOARD SUPPORT PACKAGE>). 
-
-   For example (with sh):
- 
-   $ export RTEMS_LIBRARY_PATH=/opt/rtems-4.6/i386-rtems/pc386
-
-
-2. Unfortunately pjproject's configure script is unable to create "build.mak" 
-   for cross compilation (but this may change in the future), so we need to 
-   create "build.mak" manually.
-
-   The file "README-configure" has some info about the variables in "build.mak".
-
-   For example, the "build.mak" for i386 target:
-
-   export MACHINE_NAME := i386
-   export OS_NAME := rtems
-   export HOST_NAME := mingw
-   export CC_NAME := gcc
-   export TARGET_NAME := i386-rtems
-   export CROSS_COMPILE := i386-rtems-
-
-
-3. Put additional CFLAGS or LDFLAGS that are specific to your target in 
-   "user.mak".
-
-   For example, my "user.mak" looks like this:
-
-   export CFLAGS += 
-   export LDFLAGS += -Wl,-Ttext,0x00100000 -Wl,--defsym -Wl,HeapSize=0x400000
-
-
-4. Build the libraries:
-
-   $ make dep && make distclean && make
-
-
-5. That should be it. The libraries should be in "lib" directory and 
-   applications in "bin" directory.
-
-
-
-Acknowledgements
-----------------
-Many thanks for Phil Torre <ptorre at zetron dot com>, who did most of the 
-initial porting and testing with pjlib etc. All credits go to him.
-
-
-

README.md

@@ -0,0 +1,67 @@
+
+[![CI Linux](https://github.com/pjsip/pjproject/actions/workflows/ci-linux.yml/badge.svg)](https://github.com/pjsip/pjproject/actions/workflows/ci-linux.yml)
+[![CI Mac](https://github.com/pjsip/pjproject/actions/workflows/ci-mac.yml/badge.svg)](https://github.com/pjsip/pjproject/actions/workflows/ci-mac.yml)
+[![CI Windows](https://github.com/pjsip/pjproject/actions/workflows/ci-win.yml/badge.svg)](https://github.com/pjsip/pjproject/actions/workflows/ci-win.yml)
+<BR>
+[![OSS-Fuzz](https://oss-fuzz-build-logs.storage.googleapis.com/badges/pjsip.png)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html#pjsip)
+[![Coverity-Scan](https://scan.coverity.com/projects/905/badge.svg)](https://scan.coverity.com/projects/pjsip)
+[![CodeQL](https://github.com/pjsip/pjproject/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/pjsip/pjproject/actions/workflows/codeql-analysis.yml)
+[![docs.pjsip.org](https://readthedocs.org/projects/pjsip/badge/?version=latest)](https://docs.pjsip.org/en/latest/)
+
+
+# PJSIP
+
+PJSIP is a free and open source multimedia communication library written in C with high level API in C, C++, Java, C#, and Python languages. It implements standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE. It combines signaling protocol (SIP) with rich multimedia framework and NAT traversal functionality into high level API that is portable and suitable for almost any type of systems ranging from desktops, embedded systems, to mobile handsets.
+
+## Getting PJSIP
+
+- Main repository: https://github.com/pjsip/pjproject
+- Releases: https://github.com/pjsip/pjproject/releases
+
+
+## Documentation
+
+Main documentation site: https://docs.pjsip.org
+
+Table of contents:
+
+- Overview
+  - [Overview](https://docs.pjsip.org/en/latest/overview/intro.html)
+  - [Features (Datasheet)](https://docs.pjsip.org/en/latest/overview/features.html)
+  - [License](https://docs.pjsip.org/en/latest/overview/license.html)
+- **Getting started**
+  - [Getting PJSIP](https://docs.pjsip.org/en/latest/get-started/getting.html)
+  - [General Guidelines](https://docs.pjsip.org/en/latest/get-started/general_guidelines.html)
+  - [Android](https://docs.pjsip.org/en/latest/get-started/android/index.html)
+  - [iPhone](https://docs.pjsip.org/en/latest/get-started/ios/index.html)
+  - [Mac/Linux/Unix](https://docs.pjsip.org/en/latest/get-started/posix/index.html)
+  - [Windows](https://docs.pjsip.org/en/latest/get-started/windows/index.html)
+  - [Windows Phone](https://docs.pjsip.org/en/latest/get-started/windows-phone/index.html)
+- PJSUA2 - High level API guide
+  - [Introduction](https://docs.pjsip.org/en/latest/pjsua2/intro.html)
+  - [Building PJSUA2](https://docs.pjsip.org/en/latest/pjsua2/building.html)
+  - [General concepts](https://docs.pjsip.org/en/latest/pjsua2/general_concept.html)
+  - [Hello world!](https://docs.pjsip.org/en/latest/pjsua2/building.html)
+  - [Using PJSUA2](https://docs.pjsip.org/en/latest/pjsua2/using/index.html)
+  - [Sample applications](https://docs.pjsip.org/en/latest/pjsua2/samples.html)
+- Specific guides
+  - [Audio](https://docs.pjsip.org/en/latest/specific-guides/index.html#audio)
+  - [Audio Troubleshooting](https://docs.pjsip.org/en/latest/specific-guides/index.html#audio-troubleshooting)
+  - [Build and integration](https://docs.pjsip.org/en/latest/specific-guides/index.html#build-integration)
+  - [Development and programming](https://docs.pjsip.org/en/latest/specific-guides/index.html#development-programming)
+  - [Media](https://docs.pjsip.org/en/latest/specific-guides/index.html#media)
+  - [Network and NAT](https://docs.pjsip.org/en/latest/specific-guides/index.html#network-nat)
+  - [Performance and footprint](https://docs.pjsip.org/en/latest/specific-guides/index.html#performance-footprint)
+  - [Security](https://docs.pjsip.org/en/latest/specific-guides/index.html#security)
+  - [SIP](https://docs.pjsip.org/en/latest/specific-guides/index.html#sip)
+  - [Video](https://docs.pjsip.org/en/latest/specific-guides/index.html#video)
+  - [Other](https://docs.pjsip.org/en/latest/specific-guides/index.html#other)
+- API reference
+  - [PJSUA2](https://docs.pjsip.org/en/latest/api/pjsua2/index.html) - high level API (Java/C#/Python/C++/swig)
+  - [PJSUA-LIB](https://docs.pjsip.org/en/latest/api/pjsua-lib/index.html) - high level API (C)
+  - [PJSIP](https://docs.pjsip.org/en/latest/api/pjsip/index.html) - SIP stack
+  - [PJMEDIA](https://docs.pjsip.org/en/latest/api/pjmedia/index.html) - media framework
+  - [PJNATH](https://docs.pjsip.org/en/latest/api/pjnath/index.html) - NAT traversal helper
+  - [PJLIB-UTIL](https://docs.pjsip.org/en/latest/api/pjlib-util/index.html) - utilities
+  - [PJLIB](https://docs.pjsip.org/en/latest/api/pjlib/index.html) - portable library
+

README.txt

@@ -1,948 +0,0 @@
-
-Getting Started: Building and Using PJSIP and PJMEDIA
-
-   [Last Update: $Date: 2007-02-02 20:42:44 +0000 (Fri, 02 Feb 2007) $]
-
-                                                   Print Friendly Page
-     _________________________________________________________________
-
-   This article describes how to download, customize, build, and use the open
-   source PJSIP and PJMEDIA SIP and media stack. The online (and HTML) version
-   of this file can be downloaded from http://www.pjsip.org/using.htm
-
-
-Quick Info
-     _________________________________________________________________
-
-   Building with GNU tools (Linux, *BSD, MacOS X, mingw, etc.)
-          Generally these should be all that are needed to build the libraries,
-          applications, and samples:
-
-   $ ./configure
-   $ make dep && make clean && make
-
-   Building Win32 Target with Microsoft Visual Studio
-          Generally we can just do these steps:
-
-         1. Visual Studio 6: open pjproject.dsw workspace,
-         2. Visual Studio 2005: open pjproject-vs8.sln solution,
-         3. Create an empty pjlib/include/pj/config_site.h, and
-         4. build the pjsua application.
-
-   Building for Windows Mobile
-          Generally these are all that are needed:
-
-         1. Open pjsip-apps/build/wince-evc4/wince_demos.vcw EVC4 workspace,
-         2. Create an empty pjlib/include/pj/config_site.h, and
-         3. build the pjsua_wince application.
-
-   Invoking Older Build System (e.g. for RTEMS)
-          Generally these should be all that are needed to build the libraries,
-          applications, and samples:
-
-   $ ./configure-legacy
-   $ make dep && make clean && make
-
-   Locating Output Binaries/Libraries
-          Libraries will be put in lib directory, and binaries will be put in
-          bin directory, under each projects.
-
-   Running the Applications
-          After successful build, you can try running pjsua application on
-          pjsip-apps/bin   directory.   PJSUA  manual  can  be  found  in
-          http://www.pjsip.org/pjsua.htm page.
-
-
-Table of Contents:
-     _________________________________________________________________
-
-   1. Getting the Source Distribution
-
-     1.1 Getting the Release tarball
-
-     1.2 Getting from Subversion trunk
-
-     1.3 Source Directories Layout
-
-   2. Build Preparation
-
-     2.1 config_site.h file
-
-     2.2 Disk Space Requirements
-
-   3.  Building Linux, *nix, *BSD, and MacOS X Targets with GNU Build
-   Systems
-
-     3.1 Supported Targets
-
-     3.2 Requirements
-
-     3.3 Running configure
-
-     3.4 Running make
-
-     3.5 Cross Compilation
-
-     3.6 Build Customizations
-
-   4. Building for Windows Targets with Microsoft Visual Studio
-
-     4.1 Requirements
-
-     4.2 Building the Projects
-
-     4.3 Debugging the Sample Application
-
-   5. Building for Windows Mobile Targets (Windows CE/WinCE/PDA/SmartPhone)
-
-     5.1 Requirements
-
-     5.2 Building the Projects
-
-   6. Older PJLIB Build System for Non-Autoconf Targets (e.g. RTEMS)
-
-     6.1 Supported Targets
-
-     6.2 Invoking the Build System
-
-   7. Running the Applications
-
-     7.1 pjsua
-
-     7.2 Sample Applications
-
-     7.3 pjlib-test
-
-     7.4 pjsip-test
-
-   8. Using PJPROJECT with Applications
-
-
-   Appendix I: Common Problems/Frequently Asked Question (FAQ)
-
-     I.1 fatal error C1083: Cannot open include file: 'pj/config_site.h':
-   No such file or directory
-
-
-1. Getting the Source Code Distribution
-     _________________________________________________________________
-
-   All libraries (PJLIB, PJLIB-UTIL, PJSIP, PJMEDIA, and PJMEDIA-CODEC) are
-   currently distributed under a single source tree, collectively named as
-   PJPROJECT or just PJ libraries. These libraries can be obtained by either
-   downloading the release tarball or getting them from the Subversion trunk.
-
-
-1.1 Getting the Release tarball
-     _________________________________________________________________
-
-   Getting the released tarball is a convenient way to obtain stable version of
-   PJPROJECT. The tarball may not contain the latest features or bug-fixes, but
-   normally it is considered more stable as each will be tested more rigorously
-   before released.
-
-   The   latest   released   tarball   can   be   downloaded   from   the
-   http://www.pjsip.org/download.htm.
-
-
-1.2 Getting from Subversion trunk
-     _________________________________________________________________
-
-   PJPROJECT  Subversion  repository  will always contain the latest/most
-   up-to-date version of the sources. Normally the Subversion repository is
-   always kept in a "good" state. However, there's always a chance that things
-   break  and  the  tree  doesn't  build  correctly (particularly for the
-   "not-so-popular" targets), so please consult the mailing list should there
-   be any problems.
-
-   Using Subversion also has benefits of keeping the local copy of the source
-   up to date with the main PJ source tree and to easily track the changes made
-   to the local copy, if any.
-
-
-What is Subversion
-
-   Subversion (SVN) is Open Source version control system similar to CVS.
-   Subversion homepage is in http://subversion.tigris.org/
-
-
-Getting Subversion Client
-
-   A Subversion (SVN) client is needed to download the PJ source files from
-   pjsip.org  SVN  tree.  SVN  client  binaries  can  be  downloaded from
-   http://subversion.tigris.org/, and the program should be available for
-   Windows, Linux, MacOS X, and many more platforms.
-
-
-Getting the Source for The First Time
-
-   Once Subversion client is installed, we can use these commands to initially
-   retrieve the latest sources from the Subversion trunk:
-
-
-
-   $ svn co http://svn.pjproject.net/repos/pjproject/trunk pjproject
-   $ cd pjproject
-
-
-Keeping The Local Copy Up-to-Date
-
-   Once sources have been downloaded, we can keep the local copy up to date by
-   periodically synchronizing the local source with the latest revision from
-   the  PJ's  Subversion  trunk. The mailing list provides best source of
-   information about the availability of new updates in the trunk.
-
-   To  update  the  local  copy  with the latest changes in the main PJ's
-   repository:
-
-
-
-   $ cd pjproject
-   $ svn update
-
-
-Tracking Local and Remote Changes
-
-   To see what files have been changed locally:
-
-
-
-   $ cd pjproject
-   $ svn status
-
-   The above command only compares local file against the original local copy,
-   so it doesn't require Internet connection while performing the check.
-
-   To see both what files have been changed locally and what files have been
-   updated in the PJ's Subversion repository:
-
-
-
-   $ cd pjproject
-   $ svn status -u
-
-   Note that this command requires active Internet connection to query the
-   status of PJPROJECT's source repository.
-
-
-1.3 Source Directories Layout
-     _________________________________________________________________
-
-Top-Level Directory Layout
-
-   The top-level directories (denoted as $TOP here) in the source distribution
-   contains the following sub-directories:
-
-   $TOP/build
-          Contains makefiles that are common for all projects.
-
-   $TOP/pjlib
-          Contains  header  and  source files of PJLIB. PJLIB is the base
-          portability  and  framework  library which is used by all other
-          libraries
-
-   $TOP/pjlib-util
-          Contains  PJLIB-UTIL  header and source files. PJLIB-UTIL is an
-          auxiliary library that contains utility functions such as scanner,
-          XML, STUN, MD5 algorithm, getopt() implementation, etc.
-
-   $TOP/pjmedia
-          Contains PJMEDIA and PJMEDIA-CODEC header and source files. The
-          sources of various codecs (such as GSM, Speex, and iLBC) can be found
-          under this directory.
-
-   $TOP/pjsip
-          Contains PJSIP header and source files.
-
-   $TOP/pjsip-apps
-          Contains source code for PJSUA and various sample applications.
-
-
-Individual Directory Inside Each Project
-
-   Each library directory further contains these sub-directories:
-
-   bin
-          Contains binaries produced by the build process.
-
-   build
-          Contains build scripts/makefiles, project files, project workspace,
-          etc. to build the project. In particular, it contains one Makefile
-          file  to  build the project with GNU build systems, and a *.dsw
-          workspace file to build the library with Microsoft Visual Studio 6 or
-          later.
-
-   build/output
-          The build/output directory contains the object files and other files
-          generated by the build process. To support building multiple targets
-          with a single source tree, each build target will occupy a different
-          subdirectory under this directory.
-
-   build/wince-evc4
-          This directory contains the project/workspace files to build Windows
-          CE/WinCE version of the project using Microsoft Embedded Visual C++
-          4.
-
-   build/wince-evc4/output
-          This directory contains the library, executable, and object files
-          generated by Windows Mobile build process.
-
-   docs
-          Contains Doxygen configuration file (doxygen.cfg) to generate online
-          documentation from the source files. The output documentation will be
-          put in this directory as well (for example, docs/html directory for
-          the HTML files).
-
-          (to generate Doxygen documentation from the source tree, just run
-          "doxygen docs/doxygen.cfg" in the individual project directory. The
-          generated files will reside in docs directory).
-
-   include
-          Contains the header files for the project.
-
-   lib
-          Contains libraries produced by the build process.
-
-   src
-          Contains the source files of the project.
-
-
-2. Build Preparation
-     _________________________________________________________________
-
-2.1 Create config_site.h file
-     _________________________________________________________________
-
-   Before source files can be built, the pjlib/include/pj/config_site.h file
-   must be created (it can just be an empty file).
-
-   Note:
-          When the Makefile based build system is used, this process is taken
-          care by the Makefiles. But when non-Makefile based build system (such
-          as Visual Studio) is used, the config_site.h file must be created
-          manually.
-
-
-What is config_site.h File
-
-   The pjlib/include/pj/config_site.h contains local customizations to the
-   libraries.
-
-   All customizations should be put in this file instead of modifying PJ's
-   files, because if PJ's files get modified, then those modified files will
-   not be updated the next time the source is synchronized. Or in other case,
-   the local modification may be overwritten with the fresh copy from the SVN.
-
-   Putting the local customization to the config_site.h solves this problem,
-   because this file is not included in the version control, so it will never
-   be overwritten by "svn update" command.
-
-   Please find list of configuration macros that can be overriden from these
-   files:
-     * PJLIB Configuration (the pjlib/config.h file)
-     * PJLIB-UTIL Configuration (the pjlib-util/config.h file)
-     * PJMEDIA Configuration (the pjmedia/config.h file)
-     * PJSIP Configuration (the pjsip/sip_config.h file)
-
-   A     sample    config_site.h    file    is    also    available    in
-   pjlib/include/config_site_sample.h.
-
-
-Creating config_site.h file
-
-   The simplest way is just to create an empty file, to use whetever default
-   values set by the libraries.
-
-   Another way to create the config_site.h file is to write something like the
-   following:
-
-
-   // Uncomment to get minimum footprint (suitable for 1-2 concurrent calls
-   only)
-   //#define PJ_CONFIG_MINIMAL_SIZE
-   // Uncomment to get maximum performance
-   //#define PJ_CONFIG_MAXIMUM_SPEED
-   #include <pj/config_site_sample.h>
-
-
-2.2 Disk Space Requirements
-     _________________________________________________________________
-
-   The building process needs:
-   about 50-60 MB of disk space to store the uncompressed source files, and
-     * about 30-50 MB of additional space for building each target
-
-   (Visual Studio Debug and Release are considered as separate targets)
-
-
-3. Building Linux, *nix, *BSD, and MacOS X Targets with GNU Build Systems
-     _________________________________________________________________
-
-3.1 Supported Targets
-     _________________________________________________________________
-
-   The  new,  autoconf  based  GNU  build system can be used to build the
-   libraries/applications for the following targets:
-     * Linux/uC-Linux (i386, Opteron, Itanium, MIPS, PowerPC, etc.),
-     * MacOS X (PowerPC),
-     * mingw (i386),
-     * FreeBSD and maybe other BSD's (i386, Opteron, etc.),
-     * RTEMS with cross compilation (ARM, powerpc),
-     * etc.
-
-
-3.2 Requirements
-     _________________________________________________________________
-
-   In order to use PJ's GNU build system, these typical GNU tools are needed:
-     * GNU make (other make will not work),
-     * GNU binutils for the target, and
-     * GNU gcc for the target.
-     * OpenSSL header files/libraries (optional) if TLS support is wanted.
-
-   In addition, the appropriate "SDK" must be installed for the particular
-   target (this could just be a libc and the appropriate system abstraction
-   library such as Posix).
-
-   The build system is known to work on the following hosts:
-     * Linux, many types of distributions.
-     * MacOS X 10.2
-     * mingw (Win2K, XP)
-     * FreeBSD (must use gmake instead of make)
-
-   Building Win32 applications with Cygwin is currently not supported by the
-   autoconf script (there is some Windows header conflicts), but one can still
-   use the old configure script by calling ./configure-legacy. More over,
-   cross-compilations might also work with Cygwin.
-
-
-3.3 Running configure
-     _________________________________________________________________
-
-Using Default Settings
-
-   Run  "./configure"  without  any  options to let the script detect the
-   appropriate settings for the host:
-
-
-
-   $ cd pjproject
-   $ ./configure
-   ...
-
-   Notes:
-          The default settings build the libraries in "release" mode, with
-          default CFLAGS set to "-O2 -DNDEBUG". To change the default CFLAGS,
-          we can use the usual "./configure CFLAGS='-g'" construct.
-
-    Features Customization
-
-   With the new autoconf based build system, most configuration/customization
-   can be specified as configure arguments. The list of customizable features
-   can be viewed by running "./configure --help" command:
-
-
-
-   $ cd pjproject
-   $ ./configure --help
-   ...
-   Optional Features:
-   --disable-floating-point	Disable floating point where possible
-   --disable-sound 		Exclude sound (i.e. use null sound)
-   --disable-small-filter 	Exclude small filter in resampling
-   --disable-large-filter 	Exclude large filter in resampling
-   --disable-g711-plc 		Exclude G.711 Annex A PLC
-   --disable-speex-aec 		Exclude Speex Acoustic Echo Canceller/AEC
-   --disable-g711-codec 	Exclude G.711 codecs from the build
-   --disable-l16-codec 		Exclude Linear/L16 codec family from the build
-   --disable-gsm-codec 		Exclude GSM codec in the build
-   --disable-speex-codec 	Exclude Speex codecs in the build
-   --disable-ilbc-codec 	Exclude iLBC codec in the build
-   --disable-tls Force excluding TLS support (default is autodetected based on
-   OpenSSL availability)
-   ...
-
-    Configuring Debug Version and Other Customizations
-
-   The configure script accepts standard customization, which details can be
-   obtained by executing ./configure --help.
-
-   Below is an example of specifying CFLAGS in configure:
-
-
-
-   $ ./configure CFLAGS="-O3 -DNDEBUG -msoft-float -fno-builtin"
-   ...
-
-    Configuring TLS Support
-
-   By default, TLS support is configured based on the availability of OpenSSL
-   header files and libraries. If OpenSSL is available at the default include
-   and library path locations, TLS will be enabled by the configure script.
-
-   You  can explicitly disable TLS support by giving the configure script
-   --disable-tls option.
-
-
-  3.4 Cross Compilation
-     _________________________________________________________________
-
-   Cross compilation should be supported, using the usual autoconf syntax:
-
-
-
-   $ ./configure --host=arm-elf-linux
-   ...
-
-   Since cross-compilation is not tested as often as the "normal" build, please
-   watch for the ./configure output for incorrect settings (well ideally this
-   should be done for normal build too).
-
-   Please refer to Porting Guide for further information about porting PJ
-   software.
-
-
-  3.5 Running make
-     _________________________________________________________________
-
-   Once the configure script completes successfully, start the build process by
-   invoking these commands:
-
-
-
-   $ cd pjproject
-   $ make dep
-   $ make
-
-   Note:
-          gmake may need to be specified instead of make for some hosts, to
-          invoke GNU make instead of the native make.
-
-
-   Description of all make targets supported by the Makefile's:
-
-   all
-          The default (or first) target to build the libraries/binaries.
-
-   dep, depend
-          Build dependencies rule from the source files.
-
-   clean
-          Clean  the object files for current target, but keep the output
-          library/binary files intact.
-
-   distclean, realclean
-          Remove  all  generated  files (object, libraries, binaries, and
-          dependency files) for current target.
-
-
-   Note:
-          make can be invoked either in the top-level PJ directory or in build
-          directory under each project to build only the particular project.
-
-
-  3.6 Build Customizations
-     _________________________________________________________________
-
-   Build features can be customized by specifying the options when running
-   ./configure as described in Running Configure above.
-
-   In addition, additional CFLAGS and LDFLAGS options can be put in user.mak
-   file in PJ root directory (this file may need to be created if it doesn't
-   exist). Below is a sample of user.mak file contents:
-
-
-
-   export CFLAGS += -msoft-float -fno-builtin
-   export LDFLAGS +=
-
-
-4. Building for Windows Targets with Microsoft Visual Studio
-     _________________________________________________________________
-
-  4.1 Requirements
-     _________________________________________________________________
-
-   The Microsoft Visual Studio based project files can be used with one of the
-   following:
-
-     * Microsoft Visual Studio 6,
-     * Microsoft Visual Studio .NET 2002,
-     * Microsoft Visual Studio .NET 2003,
-     * Microsoft Visual C++ 2005 (including Express edition),
-
-   In addition, the following SDK's are needed:
-     * Platform SDK, if you're using Visual Studio 2005 Express (tested with
-       Platform SDK for Windows Server 2003 SP1),
-     * DirectX SDK (tested with DirectX version 8 and 9),
-     * OpenSSL development kit would be needed if TLS support is wanted, or
-       otherwise this is optional.
-
-   For the host, the following are required:
-     * Windows NT, 2000, XP, 2003, or later ,
-     * Windows 95/98 should work too, but this has not been tested,
-     * Sufficient amount of RAM for the build process (at least 256MB).
-
-
-    Enabling TLS Support with OpenSSL
-
-   If  TLS  support  is wanted, then OpenSSL SDK must be installed in the
-   development host.
-
-   To install OpenSSL SDK from the Win32 binary distribution:
-    1. Install OpenSSL SDK to any folder (e.g. C:\OpenSSL)
-    2. Add OpenSSL DLL location to the system PATH.
-    3. Add OpenSSL include path to Visual Studio includes search directory.
-       Make sure that OpenSSL header files can be accessed from the program
-       with #include <openssl/ssl.h> construct.
-    4. Add OpenSSL library path to Visual Studio library search directory. Make
-       sure the following libraries are accessible:
-          + For Debug build: libeay32MTd and ssleay32MTd.
-          + For Release build: libeay32MT and ssleay32MT.
-
-   Then to enable TLS transport support in PJSIP, just add
-
-     #define PJSIP_HAS_TLS_TRANSPORT 1
-
-   in your pj/config_site.h. When this macro is defined, OpenSSL libraries will
-   be automatically linked to the application via the #pragma construct in
-   sip_transport_tls_ossl.c file.
-
-
-  4.2 Building the Projects
-     _________________________________________________________________
-
-   Follow the steps below to build the libraries/application using Visual
-   Studio:
-    1. For Visual Studio 6: open pjproject.dsw workspace file.
-    2. For Visual Studio 8 (VS 2005): open pjproject-vs8.sln solution file.
-    3. Set pjsua as Active Project.
-    4. Select Debug or Release build as appropriate.
-    5. Build the project. This will build pjsua application and all libraries
-       needed by pjsua.
-    6. After  successful  build,  the pjsua application will be placed in
-       pjsip-apps/bin directory, and the libraries in lib directory under each
-       projects.
-
-   To build the samples:
-    1. (Still using the same workspace)
-    2. Set samples project as Active Project
-    3. Select Debug or Release build as appropriate.
-    4. Build the project. This will build all sample applications and all
-       libraries needed.
-    5. After  successful build, the sample applications will be placed in
-       pjsip-apps/bin/samples directory, and the libraries in lib directory
-       under each projects.
-
-  4.3 Debugging the Sample Application
-     _________________________________________________________________
-
-   The sample applications are build using Samples.mak makefile, therefore it
-   is  difficult  to  setup  debugging session in Visual Studio for these
-   applications. To solve this issue, the pjsip_apps workspace contain one
-   project  called  sample_debug  which  can  be used to debug the sample
-   application.
-
-   To setup debugging using sample_debug project:
-    1. (Still using pjsip_apps workspace)
-    2. Set sample_debug project as Active Project
-    3. Edit debug.c file inside this project.
-    4. Modify the #include line to include the particular sample application to
-       debug
-    5. Select Debug build.
-    6. Build and debug the project.
-
-
-5. Building for Windows Mobile Targets (Windows CE/WinCE/PDA/SmartPhone)
-     _________________________________________________________________
-
-   PJ supports building SIP and media stacks and applications for Windows
-   Mobile targets. A very simple WinCE SIP user agent (with media) application
-   is provided just as proof of concept that the port works.
-
-  5.1 Requirements
-     _________________________________________________________________
-
-   One of the following development tools is needed to build SIP and media
-   components for Windows Mobile:
-     * Microsoft Embedded Visual C++ 4 with appropriate SDKs, or
-     * Microsoft Visual Studio 2005 for Windows Mobile with appropriate SDKs.
-
-   Note that VS2005 is not directly supported (as I don't have the tools), but
-   it is reported to work (I assumed that VS2005 for Windows Mobile can import
-   EVC4 workspace file).
-
-  5.2 Building the Projects
-     _________________________________________________________________
-
-   The Windows Mobile port is included in the main source distribution. Please
-   follow  the  following  steps  to build the WinCE libraries and sample
-   application:
-    1. Open pjsip-apps/build/wince-evc4/wince_demos.vcw workspace file. If
-       later version of EVC4 is being used, this may cause the workspace file
-       to be converted to the appropriate format.
-    2. Select pjsua_wince project as the Active Project.
-    3. Select the appropriate SDK (for example Pocket PC 2003 SDK or SmartPhone
-       2003 SDK)
-    4. Select the appropriate configuration (for example, Win32 (WCE Emulator
-       Debug) to debug the program in emulator, or other configurations such as
-       ARMV4, MIPS, SH3, SH4, or whatever suitable for the device)
-    5. Select the appropriate device (Emulator or the actual Device).
-    6. Build the project. This will build the sample WinCE application and all
-       libraries (SIP, Media, etc.) needed by this application.
-
-   Notes
-
-          + If the config_site.h includes config_site_sample.h file, then
-            there are certain configuration in config_site_sample.h that get
-            activated for Windows CE targets. Please make sure that these
-            configurations are suitable for the application.
-          + The libraries, binaries and object files produced by the build
-            process are located under build/wince-evc4/output directory of each
-            projects.
-
-
-6. Older PJLIB Build System for Non-Autoconf Targets (e.g. RTEMS)
-     _________________________________________________________________
-
-   The old PJLIB build system can still be used for building PJ libraries, for
-   example for RTEMS target. Please see the Porting PJLIB page in PJLIB
-   Reference documentation for information on how to support new target using
-   this build system.
-
-  6.1 Supported Targets
-     _________________________________________________________________
-
-   The older build system supports building PJ libraries for the following
-   operating systems:
-     * RTEMS
-     * Linux
-     * MacOS X
-     * Cygwin and Mingw
-
-   And it supports the following target architectures:
-     * i386, x86_64, itanium
-     * ARM
-     * mips
-     * powerpc
-     * mpc860
-     * etc.
-
-   For other targets, specific files need to be added to the build system,
-   please see the Porting PJLIB page in PJLIB Reference documentation for
-   details.
-
-  6.2 Invoking the Build System
-     _________________________________________________________________
-
-   To invoke the older build system, run the following:
-
-
-
-   $ cd pjproject
-   $ ./configure-legacy
-   $ make dep && make clean && make
-
-
-
-7. Running the Applications
-     _________________________________________________________________
-
-   Upon successful build, the output libraries (PJLIB, PJLIB-UTIL, PJMEDIA,
-   PJSIP, etc.) are put under ./lib sub-directory under each project directory.
-   In addition, some applications may also be built, and such applications will
-   be put in ./bin sub-directory under each project directory.
-
-
-  7.1 pjsua
-     _________________________________________________________________
-
-   pjsua is the reference implementation for both PJSIP and PJMEDIA stack, and
-   is  the  main target of the build system. Upon successful build, pjsua
-   application will be put in pjsip-apps/bin directory.
-
-   pjsua manual can be found in pjsua Manual Page.
-
-
-  7.2 Sample Applications
-     _________________________________________________________________
-
-   Sample applications will be built with the Makefile build system. For Visual
-   Studio, you have to build the samples manually by selecting and building the
-   Samples project inside pjsip-apps/build/pjsip_apps.dsw project workspace.
-
-   Upon   successful   build,   the   sample   applications  are  put  in
-   pjsip-apps/bin/samples directory.
-
-   The  sample applications are described in PJMEDIA Samples Page and
-   PJSIP Samples Page in the website.
-
-
-  7.3 pjlib-test
-     _________________________________________________________________
-
-   pjlib-test contains comprehensive tests for testing PJLIB functionality.
-   This application will only be built when the Makefile build system is used;
-   with  Visual  Studio, one has to open pjlib.dsw project in pjlib/build
-   directory to build this application.
-
-   If  you're  porting PJLIB to new target, it is recommended to run this
-   application to make sure that all functionalities works as expected.
-
-
-  7.4 pjsip-test
-     _________________________________________________________________
-
-   pjsip-test contains codes for testing various SIP functionalities in PJSIP
-   and also to benchmark static performance metrics such as message parsing per
-   second.
-
-
-
-8. Using PJPROJECT with Applications
-     _________________________________________________________________
-
-   Regardless of the build system being used, the following tasks are normally
-   needed to be done in order to build application to use PJSIP and PJMEDIA:
-    1. Put these include directories in the include search path:
-          + pjlib/include
-          + pjlib-util/include
-          + pjmedia/include
-          + pjsip/include
-    2. Put these library directories in the library search path:
-          + pjlib/lib
-          + pjlib-util/lib
-          + pjmedia/lib
-          + pjsip/lib
-    3. Include the relevant PJ header files in the application source file. For
-       example, using these would include ALL APIs exported by PJ:
-
-      #include <pjlib.h>
-      #include <pjlib-util.h>
-      #include <pjsip.h>
-      #include <pjsip_ua.h>
-      #include <pjsip_simple.h>
-      #include <pjsua.h>
-      #include <pjmedia.h>
-      #include <pjmedia-codec.h>
-       (Note: the documentation of the relevant libraries should say which
-       header files should be included to get the declaration of the APIs).
-    4. Declare the OS macros.
-          + For Windows applications built with Visual Studio, we need to
-            declare PJ_WIN32=1 macro in the project settings (declaring the
-            macro in the source file may not be sufficient).
-          + For Windows Mobile applications build with Visual C++, we need to
-            declare PJ_WIN32_WINCE=1 macro in the project settings.
-          + For  GNU build system/autoconf based build system, we need to
-            declare PJ_AUTOCONF=1 macro when compiling the applications.
-       (Note: the old PJ build system requires declaring the target processor
-       with PJ_M_XXX=1 macro, but this has been made obsolete. The target
-       processor  will  be  detected  from compiler's predefined macro by
-       pjlib/config.h file).
-    5. Link with the appropriate PJ libraries. The following libraries will
-       need to be included in the library link specifications:
-
-        pjlib
-                Base library used by all libraries.
-
-        pjlib-util
-                Auxiliary library containing scanner, XML, STUN, MD5, getopt,
-                etc, used by the SIP and media stack.
-
-        pjsip
-                SIP core stack library.
-
-        pjsip-ua
-                SIP user agent library containing INVITE session, call
-                transfer, client registration, etc.
-
-        pjsip-simple
-                SIP SIMPLE library for base event framework, presence, instant
-                messaging, etc.
-
-        pjsua
-                High level SIP UA library, combining SIP and media stack into
-                high-level easy to use API.
-
-        pjmedia
-                The media framework.
-
-        pjmedia-codec
-                Container library for various codecs such as GSM, Speex, and
-                iLBC.
-
-
-   Note: the actual library names will be appended with the target name and the
-   build configuration. For example:
-
-        For Visual Studio builds
-                The actual library names will look like
-                pjlib-i386-win32-vc6-debug.lib,
-                pjlib-i386-win32-vc6-release.lib, etc., depending on whether we
-                are building the Debug or Release version of the library.
-
-                An easier way to link with the libraries is to include PJ
-                project files in the workspace, and to configure project
-                dependencies so that the application depends on the PJ
-                libraries. This way, we don't need to manually add each PJ
-                libraries to the input library file specification, since VS
-                will automatically link the dependency libraries with the
-                application.
-
-        For Windows Mobile builds
-                Unfortunately the PJ libraries built for Windows Mobile will
-                not be placed in the usual lib directory, but rather under the
-                output directory under build/wince-evc4 project directory.
-
-                An easier way to link with the libraries is to include PJ
-                project files in the workspace, and to configure project
-                dependencies so that the application depends on the PJ
-                libraries. This way, we don't need to manually add each PJ
-                libraries to the input library file specification, since VS
-                will automatically link the dependency libraries with the
-                application.
-
-        For GNU builds
-                Application's Makefile can get the PJ library suffix by
-                including PJ's build.mak file from the root PJ directory (the
-                suffix is contained in TARGET_NAME variable). For example, to
-                link with PJLIB and PJMEDIA, we can use this syntax in the
-                LDFLAGS: "-lpj-$(TARGET_NAME) -lpjmedia-$(TARGET_NAME)"
-
-
-    6. Link with system spesific libraries:
-
-        Windows
-                Add (among other things): wsock32.lib, ws2_32.lib, ole32.lib,
-                dsound.lib
-
-        Linux, *nix, *BSD
-                Add (among other things): '-lpthread -lm' (at least).
-
-        MacOS X
-                Add (among other things): '-framework CoreAudio -lpthread -lm'.
-
-
-Appendix I: Common Problems/Frequently Asked Question (FAQ)
-     _________________________________________________________________
-
-  I.1 fatal error C1083: Cannot open include file: 'pj/config_site.h': No such
-  file or directory
-
-   This error normally occurs when the config_site.h file has not been created.
-   This file needs to be created manually (an empty file is sufficient). Please
-   follow the Build Preparation instructions above to create this file.
-
-
-
-
-
-
-
-
-     _________________________________________________________________
-
-   Feedback:
-          Thanks for using PJ libraries and for reading this document. Please
-          send feedbacks or general comments to <bennylp at pjsip dot org>.
-

SECURITY.md

@@ -0,0 +1,66 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 2.x   | :white_check_mark: |
+| < 2.0  | :x:                |
+
+## Reporting a Vulnerability
+
+Please email security@pjsip.org
+
+
+Encrypt sensitive information using our PGP public key below.
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: User-ID:	Teluu <security@pjsip.org>
+Comment: Created:	1/24/2024 10:05 AM
+Comment: Expires:	12/31/2029 12:00 PM
+Comment: Type:	3,072-bit RSA (secret key available)
+Comment: Usage:	Signing, Encryption, Certifying User-IDs
+Comment: Fingerprint:	BCCC7ADEFFABAAB10FA4CDC027E875D43D995460
+
+
+mQGNBGWwfm8BDACpBBGoBkkxgkm6hao9Fk63iEt3mJ6Ycg2BabeA7ZeHAA1IMkMG
+6247Y08Mk5DkqS+SeDu//44I6MQ/3tEDHqr59/F1qqhsu4zvPDOSgcfCET9kL7u0
+XhCrJC0DbEpTNmY9prnvNnzJOTzvbDQVysUII6b4UwhWC+Y+qhl6csVhoHUphwMs
+XZDtMR3EPpNbIrkXgUWRhEkcR2iuuLxnmdGTH8gDrtiq+IBcANkzojIEEQPulv6r
+IrrGbVx8hFRgbk5mJwIy6xRfr+5ah5gUeNM8fV/BwCUOP++qtY3c491I499XXdWa
+OpSRTSYgqY0kI0rl8B75FLG0qjnB1ySbmek++bWzK6sCJWmJxJJGjzVr3sccHOQZ
+hDUoK82OFkvde0em8HU1WnshRbSJhchrL6bO4uDMrGCYdO9uE2XHb/UiKFE9mCrw
+JKZlDg6PPUf8Gkqf594S3raekrvwWEmq/JWsk3WtNancMUQRd1pQR6ouXU0mHIih
++1qf6hvXITxzDccAEQEAAbQaVGVsdXUgPHNlY3VyaXR5QHBqc2lwLm9yZz6JAdcE
+EwEIAEEWIQS8zHre/6uqsQ+kzcAn6HXUPZlUYAUCZbB+bwIbAwUJCypO4QULCQgH
+AgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRAn6HXUPZlUYJmfDACLT86rTd+JMpUY
+iqYbELpOBfMkY0ebXVWQE/1FjmE5itS6XgHb3BWwXq99wtn9yKgwqbG8F2A/PVZd
+4Ga/EI0jyfJN85tjbk+bEqAkKIhzVljuLl6qkDqOOr6EzGAVAHLIJ1NgPLOOZKF8
+WM4t3WBTKRTJmGL9uNE/yblbRqrtsLAbtLcyZk0f8E8UYCIrWHKV7teop0VeBUw3
++a0ISa9NHCLH35FYGROPL3s1CieWrYOSS/B8ncChqB8sfCE3UkcTTWvPSvCpYEIY
+mZjQa975HFcvYaD+sYJ+ZwJJGg5fm1jLaGFrL5zTvPpx53Y3u/SBXTeGEmal/tvp
+s5hz/3ZZeSmTLLcWjG1xcxVGnQF7EK4h1EmvcTz7mZrTY+ZHohnv7a50G3C5eo2s
+tNkf0E0ajfmgLXClxWMue+TzhwnnMQN7jdbTRU8SLgooG4LJeww7TiLI2eiyZC7L
+wOhNsbOyofnIfT0q/xWHKGJFe7Sffk6+cT/Jw0EWrt+34ATEUmC5AY0EZbB+bwEM
+AKan7Fo7Y2PDLh+hMb4KrPfQyypBIv8+//Ln4oEZLcYFcNzdWWVc4z54YfqkSu8j
+vGhjYKk5JK1l9RBHPoFGPV4pmG2hf/wSeNoYcs7Tz4wQapCYLNL6ouA9hJIezG5S
+BYs74njIrFtycJXlXhOlqzsJQ7dcMWlYjeXyiOFVYWyzcfwZWGJQ7i6YotmRxx6j
+IfJ3abRJtgTeUXqUNUagetpOjno+R8uYhm6r1sgajyi/WE8QMixVNoWgUo94jhk4
+ZAcAAw/gBN+pGQawf9TOC4llle8g0YENf39m/GtQ6PD6ks1pSnjXNLhiIHkrv5eD
++I8td0RSbsHqgWjO1F4/h1eH4yQXbV5QTIcVgE5yLqIQaoScEFsOokLFm8NDWrVA
+eI0TBbOm1qtHaPpJROrEQkTyJBBFCFKRuC5u7LCirlN+O21lZDgKg/bPNe6tV4zr
+30FEsVy0njusY5ZSapbLemAOQldIwphgp8WBMFxq1tb86n6dOLYYte1A8DF3ryHM
+iQARAQABiQG8BBgBCAAmFiEEvMx63v+rqrEPpM3AJ+h11D2ZVGAFAmWwfm8CGwwF
+CQsqTuEACgkQJ+h11D2ZVGAcLAv+JB0iNqrtVG/cqBz44VC2+zJ6rAuGYuiR1sNL
+Ejvk9D483ZUKUpsZOjpVkgEJ88Fw73RoAiuEvF78mN6CloIIxQtJCFRs66PECjJP
+m9pjzx5wer2TqC+7l6fNp8pXFuLoeirvYTPisdUM+cqJ9N37BekqqiE0LSdGWcmK
+GqlO3DjPgyWfjE5rSGy9Bu4l9HKmv8AUtFiw3g65cwDC/23LFYK+HJB8gelLytkp
+kLSC6HbNg6lpnFoqhIJYBr3TK8IKXhD62dO4B3IyWnqMnKFJ2fv1ILj42LlzWgZo
+ULnZUI/EUpV3+5ELVmNKJiWGB1OgVsaJalN5TMqnr2iXPg1qnJzvzvvuwwDfA6g0
+EeR5H7yOK5WvQvGDJrUaESXRMZgubJmv42EmfT048Ajq1/SaWTdQqRK9CoFIJTOY
+lQAakbU2ukwSJRdwd+PDRFWB8c4geIAtiYJw+LseTKtjo4++hADQBoRkqgnKB1o7
+oUbFbwQAAHfNE3xFJespnLA/KbbO
+=Oiwu
+-----END PGP PUBLIC KEY BLOCK-----
+```

build.mak.in

@@ -1,66 +1,357 @@
+export PJDIR := @ac_pjdir@
+include $(PJDIR)/version.mak
+export PJ_DIR := $(PJDIR)
+
 # @configure_input@
 export MACHINE_NAME := auto
 export OS_NAME := auto
 export HOST_NAME := unix
 export CC_NAME := gcc
+export TARGET_ARCH := @ac_target_arch@
+export STD_CPP_LIB := @ac_std_cpp_lib@
 export TARGET_NAME := @target@
 export CROSS_COMPILE := @ac_cross_compile@
 export LINUX_POLL := @ac_linux_poll@ 
+export SHLIB_SUFFIX := @ac_shlib_suffix@
+
+export prefix := @prefix@
+export exec_prefix := @exec_prefix@
+export includedir := @includedir@
+export libdir := @libdir@
+
+LIB_SUFFIX := $(TARGET_NAME).a
+
+ifeq (@ac_shared_libraries@,1)
+export PJ_SHARED_LIBRARIES := 1
+endif
+
+ifeq (@ac_no_pjsua2@,1)
+export PJ_EXCLUDE_PJSUA2 := 1
+endif
+
+ifndef EXCLUDE_APP
+ifeq ($(findstring android,$(TARGET_NAME)),)
+export EXCLUDE_APP := 0
+else
+export EXCLUDE_APP := 1
+endif
+endif
 
 # Determine which party libraries to use
-export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME)
+export APP_THIRD_PARTY_EXT :=
+export APP_THIRD_PARTY_LIBS :=
+export APP_THIRD_PARTY_LIB_FILES :=
+
+ifneq (@ac_no_srtp@,1)
+ifneq (@ac_external_srtp@,0)
+# External SRTP library
+APP_THIRD_PARTY_EXT += -l@ac_external_srtp_lib@
+else
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX)
+ifeq ($(PJ_SHARED_LIBRARIES),)
+APP_THIRD_PARTY_LIBS += -lsrtp-$(TARGET_NAME)
+else
+APP_THIRD_PARTY_LIBS += -lsrtp
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX)
+endif
+endif
+endif
+
+ifeq (@ac_pjmedia_resample@,libresample)
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
+ifeq ($(PJ_SHARED_LIBRARIES),)
+ifeq (@ac_resample_dll@,1)
+export PJ_RESAMPLE_DLL := 1
+APP_THIRD_PARTY_LIBS += -lresample
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX)
+else
+APP_THIRD_PARTY_LIBS += -lresample-$(TARGET_NAME)
+endif
+else
+APP_THIRD_PARTY_LIBS += -lresample
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX)
+endif
+endif
 
 ifneq (@ac_no_gsm_codec@,1)
+ifeq (@ac_external_gsm@,1)
+# External GSM library
+APP_THIRD_PARTY_EXT += -lgsm
+else
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX)
+ifeq ($(PJ_SHARED_LIBRARIES),)
 APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME)
+else
+APP_THIRD_PARTY_LIBS += -lgsmcodec
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libgsmcodec.$(SHLIB_SUFFIX)
+endif
+endif
 endif
 
 ifneq (@ac_no_speex_codec@,1)
+ifeq (@ac_external_speex@,1)
+APP_THIRD_PARTY_EXT += -lspeex -lspeexdsp
+else
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX)
+ifeq ($(PJ_SHARED_LIBRARIES),)
 APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME)
+else
+APP_THIRD_PARTY_LIBS += -lspeex
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libspeex.$(SHLIB_SUFFIX)
+endif
+endif
 endif
 
 ifneq (@ac_no_ilbc_codec@,1)
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec-$(LIB_SUFFIX)
+ifeq ($(PJ_SHARED_LIBRARIES),)
 APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME)
+else
+APP_THIRD_PARTY_LIBS += -lilbccodec
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libilbccodec.$(SHLIB_SUFFIX)
+endif
 endif
 
-ifneq ($(findstring pa,@ac_pjmedia_snd@),)
-APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME)
+ifneq (@ac_no_g7221_codec@,1)
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec-$(LIB_SUFFIX)
+ifeq ($(PJ_SHARED_LIBRARIES),)
+APP_THIRD_PARTY_LIBS += -lg7221codec-$(TARGET_NAME)
+else
+APP_THIRD_PARTY_LIBS += -lg7221codec
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libg7221codec.$(SHLIB_SUFFIX)
+endif
 endif
 
+ifeq (@ac_external_pa@,1)
+# External PA
+APP_THIRD_PARTY_EXT += -lportaudio
+endif
+
+ifneq (@ac_no_yuv@,1)
+ifeq (@ac_external_yuv@,1)
+APP_THIRD_PARTY_EXT += -lyuv
+else
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libyuv-$(LIB_SUFFIX)
+ifeq ($(PJ_SHARED_LIBRARIES),)
+APP_THIRD_PARTY_LIBS += -lyuv-$(TARGET_NAME)
+else
+APP_THIRD_PARTY_LIBS += -lyuv
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libyuv.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libyuv.$(SHLIB_SUFFIX)
+endif
+endif
+endif
+
+ifneq (@ac_no_webrtc@,1)
+ifeq (@ac_external_webrtc@,1)
+APP_THIRD_PARTY_EXT += -lwebrtc
+else
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-$(LIB_SUFFIX)
+ifeq ($(PJ_SHARED_LIBRARIES),)
+APP_THIRD_PARTY_LIBS += -lwebrtc-$(TARGET_NAME)
+else
+APP_THIRD_PARTY_LIBS += -lwebrtc
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX)
+endif
+endif
+endif
+
+ifneq (@ac_no_webrtc_aec3@,1)
+ifeq (@ac_external_webrtc_aec3@,1)
+APP_THIRD_PARTY_EXT += -lwebrtc-aec3
+else
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3-$(LIB_SUFFIX)
+ifeq ($(PJ_SHARED_LIBRARIES),)
+APP_THIRD_PARTY_LIBS += -lwebrtc-aec3-$(TARGET_NAME)
+else
+APP_THIRD_PARTY_LIBS += -lwebrtc-aec3
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX)
+endif
+endif
+endif
+
+
+# Additional flags
+@ac_build_mak_vars@
+
+#
+# Video
+# Note: there are duplicated macros in pjmedia/os-auto.mak.in (and that's not
+#       good!
+
+# SDL flags
+SDL_CFLAGS = @ac_sdl_cflags@
+SDL_LDFLAGS = @ac_sdl_ldflags@
+
+# FFMPEG flags
+FFMPEG_CFLAGS = @ac_ffmpeg_cflags@ 
+FFMPEG_LDFLAGS =  @ac_ffmpeg_ldflags@
+
+# Video4Linux2
+V4L2_CFLAGS = @ac_v4l2_cflags@
+V4L2_LDFLAGS = @ac_v4l2_ldflags@
+
+# OPENH264 flags
+OPENH264_CFLAGS = @ac_openh264_cflags@ 
+OPENH264_LDFLAGS =  @ac_openh264_ldflags@
+
+# VPX flags
+VPX_CFLAGS = @ac_vpx_cflags@ 
+VPX_LDFLAGS =  @ac_vpx_ldflags@
+
+# QT
+AC_PJMEDIA_VIDEO_HAS_QT = @ac_pjmedia_video_has_qt@
+# QT_CFLAGS = @ac_qt_cflags@
+
+# Darwin (Mac and iOS)
+AC_PJMEDIA_VIDEO_HAS_DARWIN = @ac_pjmedia_video_has_darwin@
+AC_PJMEDIA_VIDEO_HAS_METAL = @ac_pjmedia_video_has_metal@
+AC_PJMEDIA_VIDEO_HAS_VTOOLBOX = @ac_pjmedia_video_has_vtoolbox@
+AC_PJMEDIA_VIDEO_HAS_IOS_OPENGL = @ac_pjmedia_video_has_ios_opengl@
+DARWIN_CFLAGS = @ac_darwin_cflags@
+
+# mingw
+AC_PJMEDIA_VIDEO_DEV_HAS_DSHOW = @ac_pjmedia_video_dev_has_dshow@
+ifeq (@ac_pjmedia_video_dev_has_dshow@,yes)
+DSHOW_CFLAGS = @ac_dshow_cflags@
+DSHOW_LDFLAGS = @ac_dshow_ldflags@
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libbaseclasses-$(LIB_SUFFIX)
+APP_THIRD_PARTY_LIBS += -lbaseclasses-$(TARGET_NAME)
+endif
+
+# Android
+ANDROID_CFLAGS = @ac_android_cflags@
+OBOE_CFLAGS = @ac_oboe_cflags@
+
+# PJMEDIA features exclusion
+PJ_VIDEO_CFLAGS += $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(DSHOW_CFLAGS) $(QT_CFLAGS) \
+                   $(OPENH264_CFLAGS) $(VPX_CFLAGS) $(DARWIN_CFLAGS)
+PJ_VIDEO_LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) $(DSHOW_LDFLAGS) \
+                   $(OPENH264_LDFLAGS) $(VPX_LDFLAGS)
 
 # CFLAGS, LDFLAGS, and LIBS to be used by applications
-export PJDIR := @ac_pjdir@
-export APP_CC := $(CROSS_COMPILE)$(CC_NAME)
+export APP_CC := @CC@
+export APP_CXX := @CXX@
 export APP_CFLAGS := -DPJ_AUTOCONF=1\
-	@CFLAGS@\
-	-I$(PJDIR)/pjlib/include\
-	-I$(PJDIR)/pjlib-util/include\
-	-I$(PJDIR)/pjnath/include\
-	-I$(PJDIR)/pjmedia/include\
-	-I$(PJDIR)/pjsip/include
-export APP_CXXFLAGS := $(APP_CFLAGS)
+        @CFLAGS@\
+        $(PJ_VIDEO_CFLAGS) \
+        -I$(PJDIR)/pjlib/include\
+        -I$(PJDIR)/pjlib-util/include\
+        -I$(PJDIR)/pjnath/include\
+        -I$(PJDIR)/pjmedia/include\
+        -I$(PJDIR)/pjsip/include
+export APP_CXXFLAGS := @CXXFLAGS@ $(APP_CFLAGS)
 export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
-	-L$(PJDIR)/pjlib-util/lib\
-	-L$(PJDIR)/pjnath/lib\
-	-L$(PJDIR)/pjmedia/lib\
-	-L$(PJDIR)/pjsip/lib\
-	-L$(PJDIR)/third_party/lib\
-	@LDFLAGS@
-export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\
-	-lpjsip-ua-$(TARGET_NAME)\
-	-lpjsip-simple-$(TARGET_NAME)\
-	-lpjsip-$(TARGET_NAME)\
-	-lpjmedia-codec-$(TARGET_NAME)\
-	-lpjmedia-$(TARGET_NAME)\
-	-lpjnath-$(TARGET_NAME)\
-	-lpjlib-util-$(TARGET_NAME)\
-	$(APP_THIRD_PARTY_LIBS)\
-	-lpj-$(TARGET_NAME)\
-	@LIBS@
+        -L$(PJDIR)/pjlib-util/lib\
+        -L$(PJDIR)/pjnath/lib\
+        -L$(PJDIR)/pjmedia/lib\
+        -L$(PJDIR)/pjsip/lib\
+        -L$(PJDIR)/third_party/lib\
+        $(PJ_VIDEO_LDFLAGS) \
+        @LDFLAGS@
+export APP_LDXXFLAGS := $(APP_LDFLAGS)
 
-export PJ_DIR := $(PJDIR)
+export APP_LIB_FILES := \
+        $(PJ_DIR)/pjsip/lib/libpjsua-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjsip/lib/libpjsip-ua-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjsip/lib/libpjsip-simple-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjsip/lib/libpjsip-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjmedia/lib/libpjmedia-codec-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjmedia/lib/libpjmedia-videodev-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjmedia/lib/libpjmedia-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjmedia/lib/libpjmedia-audiodev-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjnath/lib/libpjnath-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjlib-util/lib/libpjlib-util-$(LIB_SUFFIX) \
+        $(APP_THIRD_PARTY_LIB_FILES) \
+        $(PJ_DIR)/pjlib/lib/libpj-$(LIB_SUFFIX)
+export APP_LIBXX_FILES := \
+        $(PJ_DIR)/pjsip/lib/libpjsua2-$(LIB_SUFFIX) \
+        $(APP_LIB_FILES)
+
+ifeq ($(PJ_SHARED_LIBRARIES),)
+export PJLIB_LDLIB := -lpj-$(TARGET_NAME)
+export PJLIB_UTIL_LDLIB := -lpjlib-util-$(TARGET_NAME)
+export PJNATH_LDLIB := -lpjnath-$(TARGET_NAME)
+export PJMEDIA_AUDIODEV_LDLIB := -lpjmedia-audiodev-$(TARGET_NAME)
+export PJMEDIA_VIDEODEV_LDLIB := -lpjmedia-videodev-$(TARGET_NAME)
+export PJMEDIA_LDLIB := -lpjmedia-$(TARGET_NAME)
+export PJMEDIA_CODEC_LDLIB := -lpjmedia-codec-$(TARGET_NAME)
+export PJSIP_LDLIB := -lpjsip-$(TARGET_NAME)
+export PJSIP_SIMPLE_LDLIB := -lpjsip-simple-$(TARGET_NAME)
+export PJSIP_UA_LDLIB := -lpjsip-ua-$(TARGET_NAME)
+export PJSUA_LIB_LDLIB := -lpjsua-$(TARGET_NAME)
+export PJSUA2_LIB_LDLIB := -lpjsua2-$(TARGET_NAME)
+else
+export PJLIB_LDLIB := -lpj
+export PJLIB_UTIL_LDLIB := -lpjlib-util
+export PJNATH_LDLIB := -lpjnath
+export PJMEDIA_AUDIODEV_LDLIB := -lpjmedia-audiodev
+export PJMEDIA_VIDEODEV_LDLIB := -lpjmedia-videodev
+export PJMEDIA_LDLIB := -lpjmedia
+export PJMEDIA_CODEC_LDLIB := -lpjmedia-codec
+export PJSIP_LDLIB := -lpjsip
+export PJSIP_SIMPLE_LDLIB := -lpjsip-simple
+export PJSIP_UA_LDLIB := -lpjsip-ua
+export PJSUA_LIB_LDLIB := -lpjsua
+export PJSUA2_LIB_LDLIB := -lpjsua2
+
+export ADD_LIB_FILES := $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX) \
+        $(PJ_DIR)/pjsip/lib/libpjsip-ua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsip-ua.$(SHLIB_SUFFIX) \
+        $(PJ_DIR)/pjsip/lib/libpjsip-simple.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsip-simple.$(SHLIB_SUFFIX) \
+        $(PJ_DIR)/pjsip/lib/libpjsip.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsip.$(SHLIB_SUFFIX) \
+        $(PJ_DIR)/pjmedia/lib/libpjmedia-codec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjmedia/lib/libpjmedia-codec.$(SHLIB_SUFFIX) \
+        $(PJ_DIR)/pjmedia/lib/libpjmedia-videodev.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjmedia/lib/libpjmedia-videodev.$(SHLIB_SUFFIX) \
+        $(PJ_DIR)/pjmedia/lib/libpjmedia.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjmedia/lib/libpjmedia.$(SHLIB_SUFFIX) \
+        $(PJ_DIR)/pjmedia/lib/libpjmedia-audiodev.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjmedia/lib/libpjmedia-audiodev.$(SHLIB_SUFFIX) \
+        $(PJ_DIR)/pjnath/lib/libpjnath.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjnath/lib/libpjnath.$(SHLIB_SUFFIX) \
+        $(PJ_DIR)/pjlib-util/lib/libpjlib-util.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjlib-util/lib/libpjlib-util.$(SHLIB_SUFFIX) \
+        $(PJ_DIR)/pjlib/lib/libpj.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjlib/lib/libpj.$(SHLIB_SUFFIX)
+
+APP_LIB_FILES += $(ADD_LIB_FILES)
+
+APP_LIBXX_FILES += $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX) \
+        $(ADD_LIB_FILES)
+endif
+
+ifeq ($(PJ_EXCLUDE_PJSUA2),1)
+export PJSUA2_LIB_LDLIB :=
+endif
+
+export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
+        $(PJSIP_UA_LDLIB) \
+        $(PJSIP_SIMPLE_LDLIB) \
+        $(PJSIP_LDLIB) \
+        $(PJMEDIA_CODEC_LDLIB) \
+        $(PJMEDIA_VIDEODEV_LDLIB) \
+        $(PJMEDIA_AUDIODEV_LDLIB) \
+        $(PJMEDIA_LDLIB) \
+        $(PJNATH_LDLIB) \
+        $(PJLIB_UTIL_LDLIB) \
+        $(APP_THIRD_PARTY_LIBS)\
+        $(APP_THIRD_PARTY_EXT)\
+        $(PJLIB_LDLIB) \
+        @LIBS@
+export APP_LDXXLIBS := $(PJSUA2_LIB_LDLIB) \
+        -lstdc++ \
+        $(APP_LDLIBS)
+
+# Here are the variables to use if application is using the library
+# from within the source distribution
 export PJ_CC := $(APP_CC)
+export PJ_CXX := $(APP_CXX)
 export PJ_CFLAGS := $(APP_CFLAGS)
 export PJ_CXXFLAGS := $(APP_CXXFLAGS)
 export PJ_LDFLAGS := $(APP_LDFLAGS)
+export PJ_LDXXFLAGS := $(APP_LDXXFLAGS)
 export PJ_LDLIBS := $(APP_LDLIBS)
+export PJ_LDXXLIBS := $(APP_LDXXLIBS)
+export PJ_LIB_FILES := $(APP_LIB_FILES)
+export PJ_LIBXX_FILES := $(APP_LIBXX_FILES)
 
+# And here are the variables to use if application is using the
+# library from the install location (i.e. --prefix)
+export PJ_INSTALL_DIR := @prefix@
+export PJ_INSTALL_INC_DIR := @includedir@
+export PJ_INSTALL_LIB_DIR := @libdir@
+export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @ac_cflags@
+export PJ_INSTALL_LDFLAGS_PRIVATE := $(APP_THIRD_PARTY_LIBS) $(APP_THIRD_PARTY_EXT) @LIBS@
+export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(filter-out $(PJ_INSTALL_LDFLAGS_PRIVATE),$(APP_LDXXLIBS))

build.symbian/00.bat

@@ -3,4 +3,5 @@
 @rem set EPOCROOT=\Symbian\9.1\S60_3rd_MR_2\
 @rem set EPOCROOT=\Symbian\UIQ3SDK\
 @rem set EPOCROOT=\symbian\UIQ3.1\
+@rem set EPOCROOT=\symbian\9.2\S60_3rd_FP1\
 bldmake bldfiles

build.symbian/bld.inf

@@ -1,21 +1,35 @@
 prj_platforms
 winscw
-//armv5
+armv5
 gcce
 
 prj_mmpfiles
+
+/* Libraries */
 pjlib.mmp
 pjlib_util.mmp
 pjnath.mmp
 pjsdp.mmp
-null_audio.mmp
-symbian_audio.mmp
 pjmedia.mmp
 pjsip.mmp
 pjsip_simple.mmp
 pjsip_ua.mmp
 pjsua_lib.mmp
+libsrtp.mmp
 
+/* Codecs */
+libgsmcodec.mmp
+libspeexcodec.mmp
+libg7221codec.mmp
+libpassthroughcodec.mmp
+
+/* Resample */
+libresample.mmp
+
+/* Audio device. */
+pjmedia_audiodev.mmp
+
+/* Applications */
+//symsndtest.mmp
 pjlib_test.mmp
-symbian_ua.mmp
-symsndtest.mmp
+../pjsip-apps/src/pjsua/symbian/group/pjsua.mmp

build.symbian/libg7221codec.mmp

@@ -0,0 +1,56 @@
+TARGET 		libg7221codec.lib
+TARGETTYPE 	lib
+
+//OPTION		CW -lang c++
+OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
+
+MACRO		PJ_M_I386=1
+MACRO		PJ_SYMBIAN=1
+
+//
+// GSM codec third party source
+//
+
+SOURCEPATH	..\third_party\g7221\common
+
+SOURCE		basic_op.c
+SOURCE		common.c
+SOURCE		huff_tab.c
+SOURCE		tables.c
+
+SOURCEPATH	..\third_party\g7221\decode
+
+SOURCE		coef2sam.c
+SOURCE		dct4_s.c
+SOURCE		decoder.c
+
+SOURCEPATH	..\third_party\g7221\encode
+
+SOURCE		dct4_a.c
+SOURCE		encoder.c
+SOURCE		sam2coef.c
+
+
+//
+// GSM codec wrapper for pjmedia-codec
+//
+
+SOURCEPATH 	..\pjmedia\src\pjmedia-codec
+SOURCE		g7221.c
+
+//
+// Header files
+//
+
+
+SYSTEMINCLUDE	..\pjmedia\include
+SYSTEMINCLUDE	..\pjlib\include 
+SYSTEMINCLUDE	..\third_party
+SYSTEMINCLUDE	..\third_party\g7221\common
+SYSTEMINCLUDE	..\third_party\g7221\decode
+SYSTEMINCLUDE	..\third_party\g7221\encode
+
+SYSTEMINCLUDE	\epoc32\include
+SYSTEMINCLUDE	\epoc32\include\libc
+

build.symbian/libgsmcodec.mmp

@@ -0,0 +1,72 @@
+#if defined(PJ_BUILD_DLL)
+
+TARGET		libgsmcodec.dll
+TARGETTYPE	dll
+UID		0x0 0xA000000F
+
+CAPABILITY	None
+LIBRARY		pjlib.lib euser.lib estlib.lib
+MACRO		PJ_DLL
+MACRO		PJ_EXPORTING
+
+DEFFILE		.\libgsmcodec.def
+
+#else
+
+TARGET 		libgsmcodec.lib
+TARGETTYPE 	lib
+
+#endif
+
+//OPTION		CW -lang c++
+OPTION          ARMCC --gnu
+
+MACRO		PJ_M_I386=1
+MACRO		PJ_SYMBIAN=1
+
+//
+// GSM codec third party source
+//
+
+SOURCEPATH	..\third_party\gsm\src
+
+SOURCE		add.c
+SOURCE		code.c
+SOURCE		debug.c
+SOURCE		decode.c
+SOURCE		gsm_create.c
+SOURCE		gsm_decode.c
+SOURCE		gsm_destroy.c
+SOURCE		gsm_encode.c
+SOURCE		gsm_explode.c
+SOURCE		gsm_implode.c
+SOURCE		gsm_option.c
+SOURCE		gsm_print.c
+SOURCE		long_term.c
+SOURCE		lpc.c
+SOURCE		preprocess.c
+SOURCE		rpe.c
+SOURCE		short_term.c
+SOURCE		table.c
+
+
+//
+// GSM codec wrapper for pjmedia-codec
+//
+
+SOURCEPATH 	..\pjmedia\src\pjmedia-codec
+SOURCE		gsm.c
+
+//
+// Header files
+//
+
+
+SYSTEMINCLUDE	..\pjmedia\include
+SYSTEMINCLUDE	..\pjlib\include 
+SYSTEMINCLUDE	..\third_party\build\gsm
+SYSTEMINCLUDE	..\third_party\gsm\inc
+
+SYSTEMINCLUDE	\epoc32\include
+SYSTEMINCLUDE	\epoc32\include\libc
+

build.symbian/libpassthroughcodec.mmp

@@ -0,0 +1,27 @@
+TARGET		libpassthroughcodec.lib
+TARGETTYPE	lib
+
+MACRO		HAVE_CONFIG_H
+MACRO		PJ_M_I386=1
+MACRO		PJ_SYMBIAN=1
+
+//
+// GCCE optimization setting
+//
+OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
+
+//
+// Passthrough codecs wrapper for pjmedia-codec
+//
+SOURCEPATH 	..\pjmedia\src\pjmedia-codec
+SOURCE		passthrough.c
+
+//
+// Header files
+//
+SYSTEMINCLUDE	..\pjmedia\include
+SYSTEMINCLUDE	..\pjlib\include 
+
+SYSTEMINCLUDE	\epoc32\include 
+SYSTEMINCLUDE	\epoc32\include\libc

build.symbian/libresample.mmp

@@ -0,0 +1,26 @@
+TARGET 		libresample.lib
+TARGETTYPE 	lib
+
+SOURCEPATH	..\third_party\resample\src
+
+//
+// GCCE optimization setting
+//
+OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
+
+MACRO		PJ_M_I386=1
+MACRO		PJ_SYMBIAN=1
+
+MACRO       	RESAMPLE_HAS_SMALL_FILTER=1
+MACRO       	RESAMPLE_HAS_LARGE_FILTER=0
+
+SOURCE		resamplesubs.c
+
+SYSTEMINCLUDE	..\third_party\resample\include
+SYSTEMINCLUDE	..\third_party\build\resample
+
+SYSTEMINCLUDE	\epoc32\include
+SYSTEMINCLUDE	\epoc32\include\libc
+
+

build.symbian/libspeexcodec.mmp

@@ -0,0 +1,74 @@
+TARGET		libspeexcodec.lib
+TARGETTYPE	lib
+
+MACRO		HAVE_CONFIG_H
+MACRO		PJ_M_I386=1
+MACRO		PJ_SYMBIAN=1
+
+//
+// GCCE optimization setting
+//
+OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
+
+//
+// Speex files
+//
+SOURCEPATH	..\third_party\speex\libspeex
+
+SOURCE		bits.c
+SOURCE		cb_search.c
+SOURCE		exc_5_64_table.c
+SOURCE		exc_5_256_table.c
+SOURCE		exc_8_128_table.c
+SOURCE		exc_10_16_table.c
+SOURCE		exc_10_32_table.c
+SOURCE		exc_20_32_table.c
+SOURCE		fftwrap.c
+SOURCE		filterbank.c
+SOURCE		filters.c
+SOURCE		gain_table.c
+SOURCE		gain_table_lbr.c
+SOURCE		hexc_10_32_table.c
+SOURCE		hexc_table.c
+SOURCE		high_lsp_tables.c
+SOURCE		kiss_fft.c
+SOURCE		kiss_fftr.c
+SOURCE		lpc.c
+SOURCE		lsp.c
+SOURCE		lsp_tables_nb.c
+SOURCE		ltp.c
+SOURCE		mdf.c
+SOURCE		modes.c
+SOURCE		modes_wb.c
+SOURCE		nb_celp.c
+SOURCE		preprocess.c
+SOURCE		quant_lsp.c
+SOURCE		sb_celp.c
+SOURCE		smallft.c
+SOURCE		speex.c
+SOURCE		speex_callbacks.c
+SOURCE		speex_header.c
+SOURCE		stereo.c
+SOURCE		vbr.c
+SOURCE		vq.c
+SOURCE		window.c
+
+//
+// Speex codec wrapper for pjmedia-codec
+//
+SOURCEPATH 	..\pjmedia\src\pjmedia-codec
+SOURCE		speex_codec.c
+
+//
+// Header files
+//
+SYSTEMINCLUDE	..\third_party\speex\include\speex
+SYSTEMINCLUDE	..\third_party\speex\include
+SYSTEMINCLUDE	..\third_party\speex\symbian
+
+SYSTEMINCLUDE	..\pjmedia\include
+SYSTEMINCLUDE	..\pjlib\include 
+
+SYSTEMINCLUDE	\epoc32\include 
+SYSTEMINCLUDE	\epoc32\include\libc

build.symbian/libsrtp.mmp

@@ -0,0 +1,60 @@
+TARGET		libsrtp.lib
+TARGETTYPE	lib
+
+MACRO		PJ_M_I386=1
+MACRO		PJ_SYMBIAN=1
+
+//
+// GCCE optimization setting
+//
+OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
+
+//
+// Speex files
+//
+SOURCEPATH	..\third_party\srtp
+
+SOURCE crypto\ae_xfm\xfm.c
+SOURCE crypto\cipher\aes.c
+SOURCE crypto\cipher\aes_cbc.c
+SOURCE crypto\cipher\aes_icm.c
+SOURCE crypto\cipher\cipher.c
+SOURCE crypto\cipher\null_cipher.c
+SOURCE crypto\hash\auth.c
+SOURCE crypto\hash\hmac.c
+SOURCE crypto\hash\null_auth.c
+SOURCE crypto\hash\sha1.c
+SOURCE crypto\kernel\alloc.c
+SOURCE crypto\kernel\crypto_kernel.c
+//SOURCE crypto\kernel\err.c
+SOURCE crypto\kernel\key.c
+SOURCE crypto\math\datatypes.c
+SOURCE crypto\math\gf2_8.c
+//SOURCE crypto\math\math.c
+SOURCE crypto\math\stat.c
+SOURCE crypto\replay\rdb.c
+SOURCE crypto\replay\rdbx.c
+//SOURCE crypto\replay\ut_sim.c
+SOURCE crypto\rng\ctr_prng.c
+SOURCE crypto\rng\prng.c
+//SOURCE crypto\rng\rand_linux_kernel.c
+SOURCE crypto\rng\rand_source.c
+SOURCE pjlib\srtp_err.c
+SOURCE srtp\srtp.c
+SOURCE tables\aes_tables.c
+
+//SOURCEPATH	..\pjmedia\src\pjmedia
+
+//SOURCE transport_srtp.c
+
+//
+// Header files
+//
+SYSTEMINCLUDE	..\third_party\srtp\include
+SYSTEMINCLUDE	..\third_party\srtp\crypto\include
+SYSTEMINCLUDE	..\third_party\build\srtp
+SYSTEMINCLUDE	..\pjlib\include 
+
+SYSTEMINCLUDE	\epoc32\include 
+SYSTEMINCLUDE	\epoc32\include\libc

build.symbian/null_audio.mmp

@@ -22,6 +22,7 @@ TARGETTYPE 	lib
 SOURCEPATH	..\pjmedia\src\pjmedia
 
 OPTION		CW -lang c++
+OPTION          ARMCC --gnu
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1

build.symbian/pjlib.mmp

@@ -19,16 +19,19 @@ TARGETTYPE 	lib
 
 SOURCEPATH	..\pjlib\src\pj
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
+// Must compile as C++, otherwise exception would not work
+OPTION          CW -lang c++
+OPTION          ARMCC --cpp --gnu
+OPTION          GCC     -x c++
+OPTION          GCCE    -x c++
+
 //
 // Platform independent source
 //
+SOURCE		activesock.c
 SOURCE		array.c
 SOURCE		config.c
 SOURCE		ctype.c
@@ -40,13 +43,18 @@ SOURCE		list.c
 SOURCE		lock.c
 SOURCE		string.c
 SOURCE		log.c
+SOURCE		os_info.c
+SOURCE		os_info_symbian.cpp
 SOURCE		os_time_common.c
 SOURCE		pool.c
 SOURCE		pool_buf.c
 SOURCE		pool_caching.c
 SOURCE		rand.c
 SOURCE		rbtree.c
+SOURCE		ssl_sock_common.c
+SOURCE		ssl_sock_dump.c
 SOURCE		sock_common.c
+SOURCE		sock_qos_common.c
 SOURCE		types.c
 
 
@@ -68,8 +76,10 @@ SOURCE		os_timestamp_common.c
 SOURCE		os_time_unix.c
 SOURCE		os_timestamp_posix.c
 SOURCE		pool_policy_new.cpp
+SOURCE		ssl_sock_symbian.cpp
 SOURCE		sock_symbian.cpp
 SOURCE		sock_select_symbian.cpp
+SOURCE		sock_qos_symbian.cpp
 SOURCE		timer_symbian.cpp
 SOURCE		unicode_symbian.cpp
 

build.symbian/pjlibU.def

@@ -130,194 +130,197 @@ EXPORTS
 	pj_ioqueue_recv                          @ 129 NONAME
 	pj_ioqueue_recvfrom                      @ 130 NONAME
 	pj_ioqueue_register_sock                 @ 131 NONAME
-	pj_ioqueue_send                          @ 132 NONAME
-	pj_ioqueue_sendto                        @ 133 NONAME
-	pj_ioqueue_set_lock                      @ 134 NONAME
-	pj_ioqueue_set_user_data                 @ 135 NONAME
-	pj_ioqueue_unregister                    @ 136 NONAME
-	pj_leave_critical_section                @ 137 NONAME
-	pj_list_erase                            @ 138 NONAME
-	pj_list_find_node                        @ 139 NONAME
-	pj_list_insert_after                     @ 140 NONAME
-	pj_list_insert_before                    @ 141 NONAME
-	pj_list_insert_nodes_after               @ 142 NONAME
-	pj_list_insert_nodes_before              @ 143 NONAME
-	pj_list_merge_first                      @ 144 NONAME
-	pj_list_merge_last                       @ 145 NONAME
-	pj_list_search                           @ 146 NONAME
-	pj_list_size                             @ 147 NONAME
-	pj_lock_acquire                          @ 148 NONAME
-	pj_lock_create_null_mutex                @ 149 NONAME
-	pj_lock_create_recursive_mutex           @ 150 NONAME
-	pj_lock_create_semaphore                 @ 151 NONAME
-	pj_lock_create_simple_mutex              @ 152 NONAME
-	pj_lock_destroy                          @ 153 NONAME
-	pj_lock_release                          @ 154 NONAME
-	pj_lock_tryacquire                       @ 155 NONAME
-	pj_log                                   @ 156 NONAME
-	pj_log_1                                 @ 157 NONAME
-	pj_log_2                                 @ 158 NONAME
-	pj_log_3                                 @ 159 NONAME
-	pj_log_4                                 @ 160 NONAME
-	pj_log_5                                 @ 161 NONAME
-	pj_log_get_decor                         @ 162 NONAME
-	pj_log_get_level                         @ 163 NONAME
-	pj_log_get_log_func                      @ 164 NONAME
-	pj_log_set_decor                         @ 165 NONAME
-	pj_log_set_level                         @ 166 NONAME
-	pj_log_set_log_func                      @ 167 NONAME
-	pj_log_write                             @ 168 NONAME
-	pj_mutex_create                          @ 169 NONAME
-	pj_mutex_create_recursive                @ 170 NONAME
-	pj_mutex_create_simple                   @ 171 NONAME
-	pj_mutex_destroy                         @ 172 NONAME
-	pj_mutex_lock                            @ 173 NONAME
-	pj_mutex_trylock                         @ 174 NONAME
-	pj_mutex_unlock                          @ 175 NONAME
-	pj_ntohl                                 @ 176 NONAME
-	pj_ntohs                                 @ 177 NONAME
-	pj_pool_alloc                            @ 178 NONAME
-	pj_pool_alloc_from_block                 @ 179 NONAME
-	pj_pool_allocate_find                    @ 180 NONAME
-	pj_pool_calloc                           @ 181 NONAME
-	pj_pool_create                           @ 182 NONAME
-	pj_pool_create_int                       @ 183 NONAME
-	pj_pool_create_on_buf                    @ 184 NONAME
-	pj_pool_destroy_int                      @ 185 NONAME
-	pj_pool_factory_default_policy           @ 186 NONAME
-	pj_pool_factory_get_default_policy       @ 187 NONAME
-	pj_pool_get_capacity                     @ 188 NONAME
-	pj_pool_get_used_size                    @ 189 NONAME
-	pj_pool_getobjname                       @ 190 NONAME
-	pj_pool_init_int                         @ 191 NONAME
-	pj_pool_release                          @ 192 NONAME
-	pj_pool_reset                            @ 193 NONAME
-	pj_rand                                  @ 194 NONAME
-	pj_rbtree_erase                          @ 195 NONAME
-	pj_rbtree_find                           @ 196 NONAME
-	pj_rbtree_first                          @ 197 NONAME
-	pj_rbtree_init                           @ 198 NONAME
-	pj_rbtree_insert                         @ 199 NONAME
-	pj_rbtree_last                           @ 200 NONAME
-	pj_rbtree_max_height                     @ 201 NONAME
-	pj_rbtree_min_height                     @ 202 NONAME
-	pj_rbtree_next                           @ 203 NONAME
-	pj_rbtree_prev                           @ 204 NONAME
-	pj_register_strerror                     @ 205 NONAME
-	pj_rwmutex_create                        @ 206 NONAME
-	pj_rwmutex_destroy                       @ 207 NONAME
-	pj_rwmutex_lock_read                     @ 208 NONAME
-	pj_rwmutex_lock_write                    @ 209 NONAME
-	pj_rwmutex_unlock_read                   @ 210 NONAME
-	pj_rwmutex_unlock_write                  @ 211 NONAME
-	pj_sem_create                            @ 212 NONAME
-	pj_sem_destroy                           @ 213 NONAME
-	pj_sem_post                              @ 214 NONAME
-	pj_sem_trywait                           @ 215 NONAME
-	pj_sem_wait                              @ 216 NONAME
-	pj_set_netos_error                       @ 217 NONAME
-	pj_set_os_error                          @ 218 NONAME
-	pj_shutdown                              @ 219 NONAME
-	pj_sock_accept                           @ 220 NONAME
-	pj_sock_bind                             @ 221 NONAME
-	pj_sock_bind_in                          @ 222 NONAME
-	pj_sock_close                            @ 223 NONAME
-	pj_sock_connect                          @ 224 NONAME
-	pj_sock_getpeername                      @ 225 NONAME
-	pj_sock_getsockname                      @ 226 NONAME
-	pj_sock_getsockopt                       @ 227 NONAME
-	pj_sock_listen                           @ 228 NONAME
-	pj_sock_recv                             @ 229 NONAME
-	pj_sock_recvfrom                         @ 230 NONAME
-	pj_sock_select                           @ 231 NONAME
-	pj_sock_send                             @ 232 NONAME
-	pj_sock_sendto                           @ 233 NONAME
-	pj_sock_setsockopt                       @ 234 NONAME
-	pj_sock_shutdown                         @ 235 NONAME
-	pj_sock_socket                           @ 236 NONAME
-	pj_sockaddr_cmp                          @ 237 NONAME
-	pj_sockaddr_copy_addr                    @ 238 NONAME
-	pj_sockaddr_get_addr                     @ 239 NONAME
-	pj_sockaddr_get_addr_len                 @ 240 NONAME
-	pj_sockaddr_get_len                      @ 241 NONAME
-	pj_sockaddr_get_port                     @ 242 NONAME
-	pj_sockaddr_has_addr                     @ 243 NONAME
-	pj_sockaddr_in_get_addr                  @ 244 NONAME
-	pj_sockaddr_in_get_port                  @ 245 NONAME
-	pj_sockaddr_in_init                      @ 246 NONAME
-	pj_sockaddr_in_set_addr                  @ 247 NONAME
-	pj_sockaddr_in_set_port                  @ 248 NONAME
-	pj_sockaddr_in_set_str_addr              @ 249 NONAME
-	pj_sockaddr_init                         @ 250 NONAME
-	pj_sockaddr_print                        @ 251 NONAME
-	pj_sockaddr_set_port                     @ 252 NONAME
-	pj_sockaddr_set_str_addr                 @ 253 NONAME
-	pj_srand                                 @ 254 NONAME
-	pj_str                                   @ 255 NONAME
-	pj_strassign                             @ 256 NONAME
-	pj_strcat                                @ 257 NONAME
-	pj_strcat2                               @ 258 NONAME
-	pj_strcmp                                @ 259 NONAME
-	pj_strcmp2                               @ 260 NONAME
-	pj_strcpy                                @ 261 NONAME
-	pj_strcpy2                               @ 262 NONAME
-	pj_strdup                                @ 263 NONAME
-	pj_strdup2                               @ 264 NONAME
-	pj_strdup2_with_null                     @ 265 NONAME
-	pj_strdup3                               @ 266 NONAME
-	pj_strdup_with_null                      @ 267 NONAME
-	pj_strerror                              @ 268 NONAME
-	pj_stricmp                               @ 269 NONAME
-	pj_stricmp2                              @ 270 NONAME
-	pj_strltrim                              @ 271 NONAME
-	pj_strncmp                               @ 272 NONAME
-	pj_strncmp2                              @ 273 NONAME
-	pj_strncpy                               @ 274 NONAME
-	pj_strncpy_with_null                     @ 275 NONAME
-	pj_strnicmp                              @ 276 NONAME
-	pj_strnicmp2                             @ 277 NONAME
-	pj_strrtrim                              @ 278 NONAME
-	pj_strtoul                               @ 279 NONAME
-	pj_strtoul2                              @ 280 NONAME
-	pj_strtrim                               @ 281 NONAME
-	pj_symbianos_poll                        @ 282 NONAME
-	pj_symbianos_set_params                  @ 283 NONAME
-	pj_thread_check_stack                    @ 284 NONAME
-	pj_thread_create                         @ 285 NONAME
-	pj_thread_destroy                        @ 286 NONAME
-	pj_thread_get_name                       @ 287 NONAME
-	pj_thread_get_os_handle                  @ 288 NONAME
-	pj_thread_get_stack_info                 @ 289 NONAME
-	pj_thread_get_stack_max_usage            @ 290 NONAME
-	pj_thread_is_registered                  @ 291 NONAME
-	pj_thread_join                           @ 292 NONAME
-	pj_thread_local_alloc                    @ 293 NONAME
-	pj_thread_local_free                     @ 294 NONAME
-	pj_thread_local_get                      @ 295 NONAME
-	pj_thread_local_set                      @ 296 NONAME
-	pj_thread_register                       @ 297 NONAME
-	pj_thread_resume                         @ 298 NONAME
-	pj_thread_sleep                          @ 299 NONAME
-	pj_thread_this                           @ 300 NONAME
-	pj_time_decode                           @ 301 NONAME
-	pj_time_encode                           @ 302 NONAME
-	pj_time_gmt_to_local                     @ 303 NONAME
-	pj_time_local_to_gmt                     @ 304 NONAME
-	pj_time_val_normalize                    @ 305 NONAME
-	pj_timer_entry_init                      @ 306 NONAME
-	pj_timer_heap_cancel                     @ 307 NONAME
-	pj_timer_heap_count                      @ 308 NONAME
-	pj_timer_heap_create                     @ 309 NONAME
-	pj_timer_heap_destroy                    @ 310 NONAME
-	pj_timer_heap_earliest_time              @ 311 NONAME
-	pj_timer_heap_mem_size                   @ 312 NONAME
-	pj_timer_heap_poll                       @ 313 NONAME
-	pj_timer_heap_schedule                   @ 314 NONAME
-	pj_timer_heap_set_lock                   @ 315 NONAME
-	pj_timer_heap_set_max_timed_out_per_poll @ 316 NONAME
-	pj_unicode_to_ansi                       @ 317 NONAME
-	pj_utoa                                  @ 318 NONAME
-	pj_utoa_pad                              @ 319 NONAME
-	platform_strerror                        @ 320 NONAME
-	snprintf                                 @ 321 NONAME
-	vsnprintf                                @ 322 NONAME
+	pj_ioqueue_register_sock2                @ 132 NONAME
+	pj_ioqueue_send                          @ 133 NONAME
+	pj_ioqueue_sendto                        @ 134 NONAME
+	pj_ioqueue_set_lock                      @ 135 NONAME
+	pj_ioqueue_set_user_data                 @ 136 NONAME
+	pj_ioqueue_unregister                    @ 137 NONAME
+	pj_leave_critical_section                @ 138 NONAME
+	pj_list_erase                            @ 139 NONAME
+	pj_list_find_node                        @ 140 NONAME
+	pj_list_insert_after                     @ 141 NONAME
+	pj_list_insert_before                    @ 142 NONAME
+	pj_list_insert_nodes_after               @ 143 NONAME
+	pj_list_insert_nodes_before              @ 144 NONAME
+	pj_list_merge_first                      @ 145 NONAME
+	pj_list_merge_last                       @ 146 NONAME
+	pj_list_search                           @ 147 NONAME
+	pj_list_size                             @ 148 NONAME
+	pj_lock_acquire                          @ 149 NONAME
+	pj_lock_create_null_mutex                @ 150 NONAME
+	pj_lock_create_recursive_mutex           @ 151 NONAME
+	pj_lock_create_semaphore                 @ 152 NONAME
+	pj_lock_create_simple_mutex              @ 153 NONAME
+	pj_lock_destroy                          @ 154 NONAME
+	pj_lock_release                          @ 155 NONAME
+	pj_lock_tryacquire                       @ 156 NONAME
+	pj_log                                   @ 157 NONAME
+	pj_log_1                                 @ 158 NONAME
+	pj_log_2                                 @ 159 NONAME
+	pj_log_3                                 @ 160 NONAME
+	pj_log_4                                 @ 161 NONAME
+	pj_log_5                                 @ 162 NONAME
+	pj_log_get_decor                         @ 163 NONAME
+	pj_log_get_level                         @ 164 NONAME
+	pj_log_get_log_func                      @ 165 NONAME
+	pj_log_set_decor                         @ 166 NONAME
+	pj_log_set_level                         @ 167 NONAME
+	pj_log_set_log_func                      @ 168 NONAME
+	pj_log_write                             @ 169 NONAME
+	pj_mutex_create                          @ 170 NONAME
+	pj_mutex_create_recursive                @ 171 NONAME
+	pj_mutex_create_simple                   @ 172 NONAME
+	pj_mutex_destroy                         @ 173 NONAME
+	pj_mutex_lock                            @ 174 NONAME
+	pj_mutex_trylock                         @ 175 NONAME
+	pj_mutex_unlock                          @ 176 NONAME
+	pj_ntohl                                 @ 177 NONAME
+	pj_ntohs                                 @ 178 NONAME
+	pj_pool_alloc                            @ 179 NONAME
+	pj_pool_alloc_from_block                 @ 180 NONAME
+	pj_pool_allocate_find                    @ 181 NONAME
+	pj_pool_calloc                           @ 182 NONAME
+	pj_pool_create                           @ 183 NONAME
+	pj_pool_create_int                       @ 184 NONAME
+	pj_pool_create_on_buf                    @ 185 NONAME
+	pj_pool_destroy_int                      @ 186 NONAME
+	pj_pool_factory_default_policy           @ 187 NONAME
+	pj_pool_factory_get_default_policy       @ 188 NONAME
+	pj_pool_get_capacity                     @ 189 NONAME
+	pj_pool_get_used_size                    @ 190 NONAME
+	pj_pool_getobjname                       @ 191 NONAME
+	pj_pool_init_int                         @ 192 NONAME
+	pj_pool_release                          @ 193 NONAME
+	pj_pool_reset                            @ 194 NONAME
+	pj_rand                                  @ 195 NONAME
+	pj_rbtree_erase                          @ 196 NONAME
+	pj_rbtree_find                           @ 197 NONAME
+	pj_rbtree_first                          @ 198 NONAME
+	pj_rbtree_init                           @ 199 NONAME
+	pj_rbtree_insert                         @ 200 NONAME
+	pj_rbtree_last                           @ 201 NONAME
+	pj_rbtree_max_height                     @ 202 NONAME
+	pj_rbtree_min_height                     @ 203 NONAME
+	pj_rbtree_next                           @ 204 NONAME
+	pj_rbtree_prev                           @ 205 NONAME
+	pj_register_strerror                     @ 206 NONAME
+	pj_rwmutex_create                        @ 207 NONAME
+	pj_rwmutex_destroy                       @ 208 NONAME
+	pj_rwmutex_lock_read                     @ 209 NONAME
+	pj_rwmutex_lock_write                    @ 210 NONAME
+	pj_rwmutex_unlock_read                   @ 211 NONAME
+	pj_rwmutex_unlock_write                  @ 212 NONAME
+	pj_sem_create                            @ 213 NONAME
+	pj_sem_destroy                           @ 214 NONAME
+	pj_sem_post                              @ 215 NONAME
+	pj_sem_trywait                           @ 216 NONAME
+	pj_sem_wait                              @ 217 NONAME
+	pj_set_netos_error                       @ 218 NONAME
+	pj_set_os_error                          @ 219 NONAME
+	pj_shutdown                              @ 220 NONAME
+	pj_sock_accept                           @ 221 NONAME
+	pj_sock_bind                             @ 222 NONAME
+	pj_sock_bind_in                          @ 223 NONAME
+	pj_sock_close                            @ 224 NONAME
+	pj_sock_connect                          @ 225 NONAME
+	pj_sock_getpeername                      @ 226 NONAME
+	pj_sock_getsockname                      @ 227 NONAME
+	pj_sock_getsockopt                       @ 228 NONAME
+	pj_sock_listen                           @ 229 NONAME
+	pj_sock_recv                             @ 230 NONAME
+	pj_sock_recvfrom                         @ 231 NONAME
+	pj_sock_select                           @ 232 NONAME
+	pj_sock_send                             @ 233 NONAME
+	pj_sock_sendto                           @ 234 NONAME
+	pj_sock_setsockopt                       @ 235 NONAME
+	pj_sock_shutdown                         @ 236 NONAME
+	pj_sock_socket                           @ 237 NONAME
+	pj_sockaddr_cmp                          @ 238 NONAME
+	pj_sockaddr_copy_addr                    @ 239 NONAME
+	pj_sockaddr_get_addr                     @ 240 NONAME
+	pj_sockaddr_get_addr_len                 @ 241 NONAME
+	pj_sockaddr_get_len                      @ 242 NONAME
+	pj_sockaddr_get_port                     @ 243 NONAME
+	pj_sockaddr_has_addr                     @ 244 NONAME
+	pj_sockaddr_in_get_addr                  @ 245 NONAME
+	pj_sockaddr_in_get_port                  @ 246 NONAME
+	pj_sockaddr_in_init                      @ 247 NONAME
+	pj_sockaddr_in_set_addr                  @ 248 NONAME
+	pj_sockaddr_in_set_port                  @ 249 NONAME
+	pj_sockaddr_in_set_str_addr              @ 250 NONAME
+	pj_sockaddr_init                         @ 251 NONAME
+	pj_sockaddr_print                        @ 252 NONAME
+	pj_sockaddr_set_port                     @ 253 NONAME
+	pj_sockaddr_set_str_addr                 @ 254 NONAME
+	pj_srand                                 @ 255 NONAME
+	pj_str                                   @ 256 NONAME
+	pj_strassign                             @ 257 NONAME
+	pj_strcat                                @ 258 NONAME
+	pj_strcat2                               @ 259 NONAME
+	pj_strcmp                                @ 260 NONAME
+	pj_strcmp2                               @ 261 NONAME
+	pj_strcpy                                @ 262 NONAME
+	pj_strcpy2                               @ 263 NONAME
+	pj_strdup                                @ 264 NONAME
+	pj_strdup2                               @ 265 NONAME
+	pj_strdup2_with_null                     @ 266 NONAME
+	pj_strdup3                               @ 267 NONAME
+	pj_strdup_with_null                      @ 268 NONAME
+	pj_strerror                              @ 269 NONAME
+	pj_stricmp                               @ 270 NONAME
+	pj_stricmp2                              @ 271 NONAME
+	pj_strltrim                              @ 272 NONAME
+	pj_strncmp                               @ 273 NONAME
+	pj_strncmp2                              @ 274 NONAME
+	pj_strncpy                               @ 275 NONAME
+	pj_strncpy_with_null                     @ 276 NONAME
+	pj_strnicmp                              @ 277 NONAME
+	pj_strnicmp2                             @ 278 NONAME
+	pj_strrtrim                              @ 279 NONAME
+	pj_strtoul                               @ 280 NONAME
+	pj_strtoul2                              @ 281 NONAME
+	pj_strtrim                               @ 282 NONAME
+	pj_symbianos_poll                        @ 283 NONAME
+	pj_symbianos_set_params                  @ 284 NONAME
+	pj_thread_check_stack                    @ 285 NONAME
+	pj_thread_create                         @ 286 NONAME
+	pj_thread_destroy                        @ 287 NONAME
+	pj_thread_get_name                       @ 288 NONAME
+	pj_thread_get_os_handle                  @ 289 NONAME
+	pj_thread_get_stack_info                 @ 290 NONAME
+	pj_thread_get_stack_max_usage            @ 291 NONAME
+	pj_thread_is_registered                  @ 292 NONAME
+	pj_thread_join                           @ 293 NONAME
+	pj_thread_local_alloc                    @ 294 NONAME
+	pj_thread_local_free                     @ 295 NONAME
+	pj_thread_local_get                      @ 296 NONAME
+	pj_thread_local_set                      @ 297 NONAME
+	pj_thread_register                       @ 298 NONAME
+	pj_thread_resume                         @ 299 NONAME
+	pj_thread_sleep                          @ 300 NONAME
+	pj_thread_this                           @ 301 NONAME
+	pj_time_decode                           @ 302 NONAME
+	pj_time_encode                           @ 303 NONAME
+	pj_time_gmt_to_local                     @ 304 NONAME
+	pj_time_local_to_gmt                     @ 305 NONAME
+	pj_time_val_normalize                    @ 306 NONAME
+	pj_timer_entry_init                      @ 307 NONAME
+	pj_timer_heap_cancel                     @ 308 NONAME
+	pj_timer_heap_cancel_if_active           @ 309 NONAME
+	pj_timer_heap_count                      @ 310 NONAME
+	pj_timer_heap_create                     @ 311 NONAME
+	pj_timer_heap_destroy                    @ 312 NONAME
+	pj_timer_heap_earliest_time              @ 313 NONAME
+	pj_timer_heap_mem_size                   @ 314 NONAME
+	pj_timer_heap_poll                       @ 315 NONAME
+	pj_timer_heap_schedule                   @ 316 NONAME
+	pj_timer_heap_schedule_w_grp_lock        @ 317 NONAME
+	pj_timer_heap_set_lock                   @ 318 NONAME
+	pj_timer_heap_set_max_timed_out_per_poll @ 319 NONAME
+	pj_unicode_to_ansi                       @ 320 NONAME
+	pj_utoa                                  @ 321 NONAME
+	pj_utoa_pad                              @ 322 NONAME
+	platform_strerror                        @ 323 NONAME
+	snprintf                                 @ 324 NONAME
+	vsnprintf                                @ 325 NONAME

build.symbian/pjlib_test.mmp

@@ -8,6 +8,12 @@ SOURCEPATH	..\pjlib\src\pjlib-test
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
+// Must compile as C++, otherwise exception would not work
+OPTION CW -lang c++
+OPTION ARMCC --cpp --gnu
+OPTION GCC -x c++
+OPTION GCCE -x c++
+
 #if defined(PJ_BUILD_DLL)
 MACRO		PJ_DLL
 LIBRARY		pjlib.lib 
@@ -15,18 +21,16 @@ LIBRARY		pjlib.lib
 STATICLIBRARY	pjlib.lib 
 #endif
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 // Test files
 
+SOURCE	activesock.c
 SOURCE	atomic.c
 SOURCE	echo_clt.c
 SOURCE	errno.c
-SOURCE	exception.c
+SOURCE	exception_wrap.cpp
 SOURCE	fifobuf.c
 SOURCE	file.c
+SOURCE	hash_test.c
 SOURCE	ioq_perf.c
 SOURCE	ioq_tcp.c
 SOURCE	ioq_udp.c
@@ -34,7 +38,7 @@ SOURCE	ioq_unreg.c
 SOURCE	list.c
 SOURCE	mutex.c
 SOURCE	os.c
-SOURCE	pool.c
+SOURCE	pool_wrap.cpp
 SOURCE	pool_perf.c
 SOURCE	rand.c
 SOURCE	rbtree.c
@@ -42,8 +46,9 @@ SOURCE	select.c
 SOURCE	sleep.c
 SOURCE	sock.c
 SOURCE	sock_perf.c
+SOURCE	ssl_sock.c
 SOURCE	string.c
-SOURCE	test.c
+SOURCE	test_wrap.cpp
 SOURCE	thread.c
 SOURCE	timer.c
 SOURCE	timestamp.c
@@ -55,13 +60,24 @@ SOURCE	main_symbian.cpp
 
 DOCUMENT test.h
 
+START RESOURCE  	pjlib_test_reg.rss
+	TARGETPATH      \private\10003a3f\apps
+END
+
 SYSTEMINCLUDE	..\pjlib\include
 
 SYSTEMINCLUDE	\epoc32\include
 SYSTEMINCLUDE	\epoc32\include\libc
 
 LIBRARY		esock.lib insock.lib charconv.lib euser.lib estlib.lib 
+LIBRARY		securesocket.lib x509.lib crypto.lib x500.lib 
+LIBRARY		hal.lib efsrv.lib
+ 
 #ifdef WINSCW
 STATICLIBRARY   eexe.lib ecrt0.lib
 #endif
 
+// Need a bit of mem for logging in the app.
+EPOCSTACKSIZE		32768
+
+CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment

build.symbian/pjlib_test.pkg

@@ -0,0 +1,19 @@
+; pjlib_test.pkg
+
+; Languages
+&EN
+
+; Header
+;#{"pjlib_test"},(0x200235D3), 0, 1, 1
+#{"pjlib_test"},(0xA0000002), 0, 1, 1
+
+; Platform compatibility
+[0x101F7961], *, *, *,{"Series60ProductID"}
+
+; vendor
+%{"PJSIP"}
+:"PJSIP"
+
+; Target
+"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\pjlib_test.exe"-"!:\sys\bin\pjlib_test.exe"
+"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\pjlib_test_reg.rSC"-"!:\private\10003a3f\import\apps\pjlib_test_reg.rSC"

build.symbian/pjlib_util.mmp

@@ -22,29 +22,38 @@ SOURCEPATH	..\pjlib-util\src\pjlib-util
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
+// Must compile as C++, otherwise exception would not work
+OPTION          CW -lang c++
+OPTION          ARMCC --cpp --gnu
+OPTION          GCC -x c++
+OPTION          GCCE -x c++
 
 //
 // PJLIB-UTIL files
 //
+SOURCE	base64.c
+SOURCE	cli.c
+SOURCE	cli_console.c
+SOURCE	cli_telnet.c
 SOURCE	crc32.c
 SOURCE	dns.c
 SOURCE	dns_dump.c
+SOURCE	dns_server.c
 SOURCE	errno.c
 SOURCE	getopt.c
 SOURCE	hmac_md5.c
 SOURCE	hmac_sha1.c
+SOURCE	http_client.c
 SOURCE	md5.c
-SOURCE	resolver.c
+SOURCE	pcap.c
+SOURCE	resolver_wrap.cpp
 SOURCE	scanner.c
 SOURCE	sha1.c
 SOURCE	srv_resolver.c
 SOURCE	string.c
 SOURCE	stun_simple.c
 SOURCE	stun_simple_client.c
-SOURCE	xml.c
+SOURCE	xml_wrap.cpp
 
 //
 // Header files
@@ -56,6 +65,7 @@ SOURCE	xml.c
 //DOCUMENT pjlib-util\\getopt.h
 //DOCUMENT pjlib-util\\hmac_md5.h
 //DOCUMENT pjlib-util\hmac_sha1.h
+//DOCUMENT pjlib-util\http_client.h
 //DOCUMENT pjlib-util\md5.h
 //DOCUMENT pjlib-util\resolver.h
 //DOCUMENT pjlib-util\scanner.h

build.symbian/pjmedia.mmp

@@ -20,27 +20,42 @@ TARGETTYPE 	lib
 
 SOURCEPATH	..\pjmedia\src\pjmedia
 
-//OPTION		CW -lang c++
+//
+// GCCE optimization setting
+//
+OPTION		GCCE -O2 -fno-unit-at-a-time
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
+// Must compile as C++, otherwise exception would not work
+OPTION          CW -lang c++
+OPTION          ARMCC --cpp --gnu
+OPTION          GCC     -x c++
+OPTION          GCCE    -x c++
+
 //
 // Platform independent source
 //
 
 SOURCE		alaw_ulaw.c
 SOURCE		alaw_ulaw_table.c
+SOURCE		avi_player.c
 SOURCE		bidirectional.c
 SOURCE		clock_thread.c
 SOURCE		codec.c
+SOURCE		conf_switch.c
 SOURCE		conference.c
+SOURCE		converter.c
+SOURCE		converter_libswscale.c
+SOURCE		delaybuf.c
 SOURCE		echo_common.c
 SOURCE		echo_port.c
 SOURCE		echo_suppress.c
 SOURCE		endpoint.c
 SOURCE		errno.c
-SOURCE		delaybuf.c
+SOURCE		event.c
+SOURCE		format.c
 SOURCE		g711.c
 SOURCE		jbuf.c
 SOURCE		master_port.c
@@ -52,20 +67,45 @@ SOURCE		port.c
 SOURCE		resample_port.c
 SOURCE		resample_resample.c
 SOURCE		rtcp.c
+SOURCE		rtcp_xr.c
 SOURCE		rtp.c
 //SDP files are in pjsdp.mmp: sdp.c, sdp_cmp.c, sdp_neg.c
-SOURCE		session.c
+//SOURCE		session.c		// deprecated
 SOURCE		silencedet.c
 SOURCE		sound_port.c
 SOURCE		splitcomb.c
+SOURCE		stereo_port.c
 SOURCE		stream.c
+SOURCE		stream_common.c
+SOURCE		stream_info.c
 SOURCE		tonegen.c
+SOURCE		transport_adapter_sample.c
 SOURCE		transport_ice.c
 SOURCE		transport_udp.c
+SOURCE		transport_srtp.c
+SOURCE		types.c
+SOURCE		vid_codec.c
+SOURCE		vid_codec_util.c
+SOURCE		vid_port.c
+SOURCE		vid_stream.c
+SOURCE		vid_stream_info.c
+SOURCE		vid_tee.c
 SOURCE		wav_player.c
 SOURCE		wav_playlist.c
 SOURCE		wav_writer.c
 SOURCE		wave.c
+SOURCE		wsola.c
+
+//
+// pjmedia-codec common files
+//
+SOURCEPATH	..\pjmedia\src\pjmedia-codec
+SOURCE		audio_codecs.c
+SOURCE		amr_sdp_match.c
+SOURCE		g7221_sdp_match.c
+SOURCE		h263_packetizer.c
+SOURCE		h264_packetizer.c
+
 
 //
 // Symbian specific
@@ -84,6 +124,10 @@ SYSTEMINCLUDE	..\pjmedia\include
 SYSTEMINCLUDE	..\pjlib\include 
 SYSTEMINCLUDE	..\pjlib-util\include 
 SYSTEMINCLUDE	..\pjnath\include 
+SYSTEMINCLUDE	..\third_party\srtp\include
+SYSTEMINCLUDE	..\third_party\srtp\crypto\include
+SYSTEMINCLUDE	..\third_party\build\srtp
+SYSTEMINCLUDE	..
 
 SYSTEMINCLUDE	\epoc32\include
 SYSTEMINCLUDE	\epoc32\include\libc

build.symbian/pjmedia_audiodev.mmp

@@ -0,0 +1,33 @@
+TARGET 		pjmedia_audiodev.lib
+TARGETTYPE 	lib
+
+SOURCEPATH	..\pjmedia\src\pjmedia-audiodev
+
+//
+// GCCE optimization setting
+//
+//OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
+
+MACRO		PJ_M_I386=1
+MACRO		PJ_SYMBIAN=1
+
+SOURCE		audiodev.c
+SOURCE		errno.c
+SOURCE		symb_aps_dev.cpp
+SOURCE		symb_mda_dev.cpp
+SOURCE		symb_vas_dev.cpp
+SOURCE		null_dev.c
+
+SYSTEMINCLUDE	..\pjmedia\include
+SYSTEMINCLUDE	..\pjlib\include 
+SYSTEMINCLUDE	..\pjlib-util\include 
+
+SYSTEMINCLUDE	\epoc32\include
+SYSTEMINCLUDE	\epoc32\include\libc
+SYSTEMINCLUDE   \epoc32\include\mmf\server 
+SYSTEMINCLUDE   \epoc32\include\mmf\common 
+SYSTEMINCLUDE   \epoc32\include\mda\common 
+SYSTEMINCLUDE	\epoc32\include\mmf\plugin 
+
+

build.symbian/pjnath.mmp

@@ -17,15 +17,13 @@ TARGETTYPE 	lib
 
 #endif
 
+OPTION          ARMCC --gnu
+
 SOURCEPATH	..\pjnath\src\pjnath
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 //
 // PJNATH files
 //
@@ -37,7 +35,10 @@ SOURCE	stun_auth.c
 SOURCE	stun_msg.c
 SOURCE	stun_msg_dump.c
 SOURCE	stun_session.c
+SOURCE	stun_sock.c
 SOURCE	stun_transaction.c
+SOURCE	turn_session.c
+SOURCE	turn_sock.c
 
 //
 // Include files

build.symbian/pjsdp.mmp

@@ -19,18 +19,20 @@ TARGETTYPE 	lib
 
 SOURCEPATH	..\pjmedia\src\pjmedia
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
+// Must compile as C++, otherwise exception would not work
+OPTION          CW -lang c++
+OPTION          ARMCC --cpp --gnu
+OPTION          GCC     -x c++
+OPTION          GCCE    -x c++
+
 //
 // Platform independent source
 //
 SOURCE		errno.c
-SOURCE		sdp.c
+SOURCE		sdp_wrap.cpp
 SOURCE		sdp_cmp.c
 SOURCE		sdp_neg.c
 

build.symbian/pjsip.mmp

@@ -25,33 +25,38 @@ SOURCEPATH	..\pjsip\src\pjsip
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
+// Must compile as C++, otherwise exception would not work
+OPTION          CW -lang c++
+OPTION          ARMCC --cpp --gnu
+OPTION          GCC     -x c++
+OPTION          GCCE    -x c++
 
 // PJSIP-CORE files
 
 //SOURCE	sip_auth_aka.c
 SOURCE	sip_auth_client.c
 SOURCE	sip_auth_msg.c
-SOURCE	sip_auth_parser.c
+SOURCE	sip_auth_parser_wrap.cpp
 SOURCE	sip_auth_server.c
-SOURCE	sip_dialog.c
-SOURCE	sip_endpoint.c
+SOURCE	sip_config.c
+SOURCE	sip_dialog_wrap.cpp
+SOURCE	sip_endpoint_wrap.cpp
 SOURCE	sip_errno.c
 SOURCE	sip_msg.c
-SOURCE	sip_parser.c
+SOURCE	sip_multipart.c
+SOURCE	sip_parser_wrap.cpp
 SOURCE	sip_resolve.c
-SOURCE	sip_tel_uri.c
+SOURCE	sip_tel_uri_wrap.cpp
 SOURCE	sip_transaction.c
-SOURCE	sip_transport.c
+SOURCE	sip_transport_wrap.cpp
 SOURCE	sip_transport_loop.c
 SOURCE	sip_transport_tcp.c
 SOURCE	sip_transport_udp.c
+SOURCE	sip_transport_tls.c
 SOURCE	sip_ua_layer.c
 SOURCE	sip_uri.c
-SOURCE	sip_util.c
-SOURCE	sip_util_proxy.c
+SOURCE	sip_util_wrap.cpp
+SOURCE	sip_util_proxy_wrap.cpp
 SOURCE	sip_util_statefull.c
 
 SYSTEMINCLUDE	..\pjlib\include 

build.symbian/pjsip_simple.mmp

@@ -25,10 +25,11 @@ SOURCEPATH	..\pjsip\src\pjsip-simple
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
+// Must compile as C++, otherwise exception would not work
+OPTION          CW -lang c++
+OPTION          ARMCC --cpp --gnu
+OPTION          GCC     -x c++
+OPTION          GCCE    -x c++
 
 // PJSIP-SIMPLE files
 
@@ -36,6 +37,7 @@ SOURCE	errno.c
 SOURCE	evsub.c
 SOURCE	evsub_msg.c
 SOURCE	iscomposing.c
+SOURCE	mwi.c
 SOURCE	pidf.c
 SOURCE	presence.c
 SOURCE	presence_body.c

build.symbian/pjsip_ua.mmp

@@ -25,7 +25,11 @@ SOURCEPATH	..\pjsip\src\pjsip-ua
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-//OPTION		CW -lang c++
+// Must compile as C++, otherwise exception would not work
+OPTION          CW -lang c++
+OPTION          ARMCC --cpp --gnu
+OPTION          GCC     -x c++
+OPTION          GCCE    -x c++
 
 
 // PJSIP-UA files
@@ -35,6 +39,7 @@ SOURCE	sip_reg.c
 SOURCE	sip_replaces.c
 SOURCE	sip_xfer.c
 SOURCE	sip_100rel.c
+SOURCE	sip_timer.c
 
 SYSTEMINCLUDE	..\pjlib\include 
 SYSTEMINCLUDE	..\pjlib-util\include 

build.symbian/pjstun_client.mmp

@@ -2,15 +2,13 @@ TARGET 		pjstun_client.exe
 TARGETTYPE 	exe
 UID		0x0 0xA000000A
 
+OPTION          ARMCC --gnu
+
 SOURCEPATH	..\pjnath\src\pjstun-client
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 // PJSTUN-CLIENT files
 
 SOURCE	client_main.c

build.symbian/pjsua_lib.mmp

@@ -25,16 +25,23 @@ SOURCEPATH	..\pjsip\src\pjsua-lib
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-// OPTION		CW -lang c++
+// Must compile as C++, otherwise exception would not work
+OPTION          CW -lang c++
+OPTION          ARMCC --cpp --gnu
+OPTION          GCC     -x c++
+OPTION          GCCE    -x c++
 
 // PJLIB-UTIL files
 
 SOURCE	pjsua_acc.c
+SOURCE	pjsua_aud.c
 SOURCE	pjsua_call.c
 SOURCE	pjsua_core.c
+SOURCE	pjsua_dump.c
 SOURCE	pjsua_im.c
 SOURCE	pjsua_media.c
 SOURCE	pjsua_pres.c
+SOURCE	pjsua_vid.c
 
 SYSTEMINCLUDE	..\pjlib\include 
 SYSTEMINCLUDE	..\pjlib-util\include

build.symbian/symbian_audio.mmp

@@ -24,17 +24,24 @@ TARGETTYPE 	lib
 SOURCEPATH	..\pjmedia\src\pjmedia
 
 OPTION		CW -lang c++
+OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
+SOURCE		nullsound.c
 SOURCE		symbian_sound.cpp
+SOURCE		symbian_sound_aps.cpp
 
 SYSTEMINCLUDE	..\pjlib\include
 SYSTEMINCLUDE	..\pjmedia\include
 
 SYSTEMINCLUDE	\epoc32\include
 SYSTEMINCLUDE	\epoc32\include\libc
+SYSTEMINCLUDE   \epoc32\include\mmf\server 
+SYSTEMINCLUDE   \epoc32\include\mmf\common 
+SYSTEMINCLUDE   \epoc32\include\mda\common 
 
 SYSTEMINCLUDE	\epoc32\include\mmf\plugin 
 

build.symbian/symbian_ua.mmp

@@ -1,59 +0,0 @@
-TARGET 		symbian_ua.exe
-TARGETTYPE 	exe
-UID		0x0 0xA000000D
-
-SOURCEPATH	..\pjsip-apps\src\symbian_ua
-
-MACRO		PJ_M_I386=1
-MACRO		PJ_SYMBIAN=1
-
-#if defined(PJ_BUILD_DLL)
-	MACRO		PJ_DLL=1
-#endif
-
-// Source files
-
-SOURCE	ua.cpp
-SOURCE	main_symbian.cpp
-
-DOCUMENT ua.h
-
-SYSTEMINCLUDE	..\pjlib\include
-SYSTEMINCLUDE	..\pjlib-util\include
-SYSTEMINCLUDE	..\pjnath\include
-SYSTEMINCLUDE	..\pjmedia\include
-SYSTEMINCLUDE	..\pjsip\include
-
-SYSTEMINCLUDE	\epoc32\include
-SYSTEMINCLUDE	\epoc32\include\libc
-
-#if defined(PJ_BUILD_DLL)
-	LIBRARY		pjsua_lib.lib pjsip_ua.lib
-	LIBRARY		pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
-	LIBRARY		pjnath.lib pjlib_util.lib pjlib.lib
-	LIBRARY		symbian_audio.lib
-#else
-	STATICLIBRARY	pjsua_lib.lib pjsip_ua.lib
-	STATICLIBRARY	pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
-	STATICLIBRARY	pjnath.lib pjlib_util.lib pjlib.lib
-	STATICLIBRARY	symbian_audio.lib
-#endif
-
-#ifdef WINSCW
-	STATICLIBRARY   eexe.lib ecrt0.lib
-#endif
-
-LIBRARY		esock.lib insock.lib charconv.lib euser.lib estlib.lib 
-LIBRARY 	mediaclientaudiostream.lib
-LIBRARY 	mediaclientaudioinputstream.lib
-
-CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 
-
-START RESOURCE  symbian_ua_reg.rss
-	TARGETPATH      \private\10003a3f\apps
-END
-
-// The default 8KB seems to be insufficient with all bells and
-// whistles turned on
-EPOCSTACKSIZE	12288
-

build.symbian/symbian_ua_udeb.pkg

@@ -1,18 +0,0 @@
-; symbian_ua.pkg
-
-; Languages
-&EN
-
-; Header
-#{"symbian_ua"},(0xA000000D), 0, 1, 1
-
-; Platform compatibility
-[0x101F7961], *, *, *,{"Series60ProductID"}
-
-; vendor
-%{"PJSIP"}
-:"PJSIP"
-
-; Target
-"C:\Symbian\9.1\S60_3rd_MR\epoc32\release\gcce\UDEB\symbian_ua.exe"-"!:\sys\bin\symbian_ua.exe"
-"C:\Symbian\9.1\S60_3rd_MR\epoc32\data\z\private\10003a3f\apps\symbian_ua_reg.rSC"-"!:\private\10003a3f\import\apps\symbian_ua_reg.rSC"

build.symbian/symbian_ua_urel.pkg

@@ -1,18 +0,0 @@
-; symbian_ua.pkg
-
-; Languages
-&EN
-
-; Header
-#{"symbian_ua"},(0xA000000D), 0, 1, 1
-
-; Platform compatibility
-[0x101F7961], *, *, *,{"Series60ProductID"}
-
-; vendor
-%{"PJSIP"}
-:"PJSIP"
-
-; Target
-"C:\Symbian\9.1\S60_3rd_MR\epoc32\release\gcce\UREL\symbian_ua.exe"-"!:\sys\bin\symbian_ua.exe"
-"C:\Symbian\9.1\S60_3rd_MR\epoc32\data\z\private\10003a3f\apps\symbian_ua_reg.rSC"-"!:\private\10003a3f\import\apps\symbian_ua_reg.rSC"

build.symbian/symsndtest.mmp

@@ -1,46 +1,51 @@
-TARGET 		symsndtest.exe
-TARGETTYPE 	exe
-UID		0x0 0xA000000E
+#define SND_USE_APS	0
+#define SND_USE_VAS	0
 
-SOURCEPATH	..\pjsip-apps\src\symsndtest
+TARGET 			symsndtest.exe
+TARGETTYPE 		exe
+UID			0x0 0xA000000E
 
-MACRO		PJ_M_I386=1
-MACRO		PJ_SYMBIAN=1
+OPTION			ARMCC --gnu
 
-#if defined(PJ_BUILD_DLL)
-	MACRO		PJ_DLL=1
-#endif
+SOURCEPATH		..\pjsip-apps\src\symsndtest
+
+MACRO			PJ_M_I386=1
+MACRO			PJ_SYMBIAN=1
 
 // Test files
 
-SOURCE	app_main.cpp
-SOURCE	main_symbian.cpp
+SOURCE			app_main.cpp
+SOURCE			main_symbian.cpp
 
-SYSTEMINCLUDE	..\pjlib\include
-SYSTEMINCLUDE	..\pjmedia\include
+START RESOURCE  	symsndtest_reg.rss
+	TARGETPATH	\private\10003a3f\apps
+END
 
-SYSTEMINCLUDE	\epoc32\include
-SYSTEMINCLUDE	\epoc32\include\libc
+SYSTEMINCLUDE		..\pjlib\include
+SYSTEMINCLUDE		..\pjmedia\include
 
-LIBRARY		charconv.lib euser.lib estlib.lib
+SYSTEMINCLUDE		\epoc32\include
+SYSTEMINCLUDE		\epoc32\include\libc
 
-#if defined(PJ_BUILD_DLL)
-	LIBRARY		symbian_audio.lib pjlib.lib 
+LIBRARY			charconv.lib euser.lib estlib.lib
+LIBRARY			esock.lib insock.lib
+STATICLIBRARY		pjmedia_audiodev.lib
+STATICLIBRARY		pjmedia.lib
+STATICLIBRARY		pjlib.lib 
+STATICLIBRARY		libresample.lib
+
+#if SND_USE_APS
+	LIBRARY		APSSession2.lib
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
+#elif SND_USE_VAS
+	LIBRARY		VoIPAudioIntfc.lib
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
 #else
-	STATICLIBRARY	symbian_audio.lib pjlib.lib 
+	LIBRARY 	mediaclientaudiostream.lib
+	LIBRARY 	mediaclientaudioinputstream.lib
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment
 #endif
 
-LIBRARY		esock.lib insock.lib
-LIBRARY 	mediaclientaudiostream.lib
-LIBRARY 	mediaclientaudioinputstream.lib
-
 #ifdef WINSCW
 	STATICLIBRARY   eexe.lib ecrt0.lib
 #endif
-
-CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 
-
-START RESOURCE  symsndtest_reg.rss
-	TARGETPATH	\private\10003a3f\apps
-END
-

build.symbian/symsndtest.pkg

@@ -14,6 +14,6 @@
 :"PJSIP"
 
 ; Target
-"C:\Symbian\9.1\S60_3rd_MR\Epoc32\release\gcce\UDEB\symsndtest.exe"-"!:\sys\bin\symsndtest.exe"
-"C:\Symbian\9.1\S60_3rd_MR\Epoc32\data\z\private\10003a3f\apps\symsndtest_reg.rSC"-"!:\private\10003a3f\import\apps\symsndtest_reg.rSC"
+"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\symsndtest.exe"-"!:\sys\bin\symsndtest.exe"
+"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\symsndtest_reg.rSC"-"!:\private\10003a3f\import\apps\symsndtest_reg.rSC"
 

build/cc-auto.mak.in

@@ -0,0 +1,22 @@
+export CC = @CC@
+export CXX = @CXX@
+export AR = @AR@
+export AR_FLAGS = @AR_FLAGS@
+export LD = @LD@
+export LDOUT = -o 
+export RANLIB = @RANLIB@
+
+export OBJEXT := .@OBJEXT@
+export LIBEXT := .@LIBEXT@
+export LIBEXT2 := @LIBEXT2@
+
+export CC_OUT := @CC_OUT@
+export CC_INC := @CC_INC@
+export CC_DEF := @CC_DEF@
+export CC_OPTIMIZE := @CC_OPTIMIZE@
+export CC_LIB := -l
+
+export CC_SOURCES :=
+export CC_CFLAGS := @CC_CFLAGS@
+export CC_LDFLAGS :=
+

build/common.mak

@@ -16,6 +16,15 @@ include $(PJDIR)/build/cc-$(CC_NAME).mak
 #
 -include cc-$(CC_NAME).mak
 
+#
+# Include auto configured compiler specification.
+# This will override the compiler settings above.
+# Currently this is made OPTIONAL, to prevent people
+# from getting errors because they don't re-run ./configure
+# after downloading new PJSIP.
+#
+-include $(PJDIR)/build/cc-auto.mak
+
 #
 # Include global machine specific definitions
 #

build/host-unix.mak

@@ -3,7 +3,7 @@ export HOST_RM := rm -f @@
 export HOST_RMR := rm -rf @@
 export HOST_RMDIR := rm -rf @@
 export HOST_MKDIR := mkdir -p @@
-export HOST_EXE := 
+export HOST_EXE := $(HOST_EXE)
 export HOST_PSEP := /
 
 export HOST_SOURCES :=

build/os-linux-kernel.mak

@@ -1,43 +0,0 @@
-
-include $(KERNEL_DIR)/.config
-
-#
-# Basic kernel compilation flags.
-#
-export OS_CFLAGS   := $(CC_DEF)PJ_LINUX_KERNEL=1 -D__KERNEL__  \
-		      -I$(KERNEL_DIR)/include -iwithprefix include \
-		      -nostdinc -msoft-float
-
-#
-# Additional kernel compilation flags are taken from the kernel Makefile
-# itself.
-#
-
-KERNEL_CFLAGS := \
-    $(shell cd $(KERNEL_DIR) ; \
-    make script SCRIPT='@echo $$(CFLAGS) $$(CFLAGS_MODULE)' $(KERNEL_ARCH))
-
-export OS_CFLAGS += $(KERNEL_CFLAGS)
-
-#		      -DMODULE -I$(KERNEL_DIR)/include  -nostdinc \
-#		      -Wstrict-prototypes \
-#		      -Wno-trigraphs -fno-strict-aliasing -fno-common \
-#		      -msoft-float -m32 -fno-builtin-sprintf -fno-builtin-log2\
-#		      -fno-builtin-puts -mpreferred-stack-boundary=2 \
-#		      -fno-unit-at-a-time -march=i686 -mregparm=3 \
-#		      -iwithprefix include
-
-#export OS_CFLAGS += -U__i386__ -Ui386 -D__arch_um__ -DSUBARCH=\"i386\" \
-#		    -D_LARGEFILE64_SOURCE -I$(KERNEL_DIR)/arch/um/include \
-#		    -Derrno=kernel_errno \
-#		    -I$(KERNEL_DIR)/arch/um/kernel/tt/include \
-#		    -I$(KERNEL_DIR)/arch/um/kernel/skas/include \
-		    
-
-export OS_CXXFLAGS := 
-
-export OS_LDFLAGS  :=  
-
-export OS_SOURCES  := 
-
-

build/rules.mak

@@ -6,12 +6,24 @@ BINDIR = ../bin
 endif
 
 #
-# The full path of output lib file (e.g. ../lib/libapp.a).
+# The name(s) of output lib file(s) (e.g. libapp.a).
 #
-LIB = $($(APP)_LIB)
+LIB := $($(APP)_LIB)
+SHLIB = $($(APP)_SHLIB)
+SONAME = $($(APP)_SONAME)
+
+ifeq ($(SHLIB_SUFFIX),so)
+SHLIB_OPT := -shared -Wl,-soname,$(SHLIB)
+else ifeq ($(SHLIB_SUFFIX),dylib)
+SHLIB_OPT := -dynamiclib -undefined dynamic_lookup -flat_namespace
+else ifeq ($(SHLIB_SUFFIX),dll)
+SHLIB_OPT := -shared -Wl,-soname,$(SHLIB)
+else
+SHLIB_OPT := 
+endif
 
 #
-# The full path of output executable file (e.g. ../bin/app.exe).
+# The name of output executable file (e.g. app.exe).
 #
 EXE = $($(APP)_EXE)
 
@@ -39,13 +51,15 @@ OBJDIRS := $(sort $(dir $(OBJS)))
 #
 # FULL_SRCS is ../src/app/file1.c ../src/app/file1.S
 #
-FULL_SRCS = $(foreach file, $($(APP)_OBJS), $(SRCDIR)/$(basename $(file)).c $(SRCDIR)/$(basename $(file)).cpp $(SRCDIR)/$(basename $(file)).S)
+FULL_SRCS = $(foreach file, $($(APP)_OBJS), $(SRCDIR)/$(basename $(file)).m $(SRCDIR)/$(basename $(file)).c $(SRCDIR)/$(basename $(file)).cpp $(SRCDIR)/$(basename $(file)).cc $(SRCDIR)/$(basename $(file)).S)
 
 #
 # When generating dependency (gcc -MM), ideally we use only either
 # CFLAGS or CXXFLAGS (not both). But I just couldn't make if/ifeq to work.
 #
-DEPFLAGS = $($(APP)_CXXFLAGS) $($(APP)_CFLAGS)
+#DEPFLAGS = $($(APP)_CXXFLAGS) $($(APP)_CFLAGS)
+DEPCFLAGS =  $($(APP)_CFLAGS)
+DEPCXXFLAGS = $($(APP)_CXXFLAGS)
 
 # Dependency file
 DEP_FILE := .$(app)-$(TARGET_NAME).depend
@@ -64,28 +78,58 @@ print_common:
 	@echo $(APP)_CFLAGS=$($(APP)_CFLAGS)
 	@echo $(APP)_CXXFLAGS=$($(APP)_CXXFLAGS)
 	@echo $(APP)_LDFLAGS=$($(APP)_LDFLAGS)
-	@echo DEPFLAGS=$(DEPFLAGS)
+#	@echo DEPFLAGS=$(DEPFLAGS)
+	@echo CC=$(CC)
+	@echo AR=$(AR)
+	@echo AR_FLAGS=$(AR_FLAGS)
+	@echo RANLIB=$(RANLIB)
 
 print_bin: print_common
-	@echo EXE=$(EXE)
+	@echo EXE=$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE))
 	@echo BINDIR=$(BINDIR)
-
+ 
 print_lib: print_common
-	@echo LIB=$(LIB)
+ifneq ($(LIB),)
+	@echo LIB=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB))
+endif
+ifneq ($(SHLIB),)
+	@echo SHLIB=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB))
+endif
+ifneq ($(SONAME),)
+	@echo SONAME=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME))
+endif
 	@echo LIBDIR=$(LIBDIR)
 
-$(LIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
-	$(AR) $(LIB) $(OBJS)
-	$(RANLIB) $(LIB)
+ifneq ($(LIB),)
+$(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+	if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
+	$(AR) $(AR_FLAGS) $@ $(OBJS)
+	$(RANLIB) $@
+endif
 
-$(EXE): $(BINDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
-	$(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) \
+ifneq ($(SHLIB),)
+$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+	if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
+	$(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \
+	    $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) $(SHLIB_OPT)
+endif
+ 
+ifneq ($(SONAME),)
+$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME)): $(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB))
+	ln -sf $(SHLIB) $@
+endif
+
+ifneq ($(EXE),)
+$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+	if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi
+	$(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)) \
 	    $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS)
+endif
 
 $(OBJDIR)/$(app).o: $(OBJDIRS) $(OBJS)
 	$(CROSS_COMPILE)ld -r -o $@ $(OBJS)
 
-$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o
+$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o | $(OBJDIRS)
 	@echo Creating kbuild Makefile...
 	@echo "# Our module name:" > $(OBJDIR)/Makefile
 	@echo 'obj-m += $(app).o' >> $(OBJDIR)/Makefile
@@ -105,34 +149,49 @@ $(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o
 	@echo all: >> $(OBJDIR)/Makefile
 	@echo -e "\tmake -C $(KERNEL_DIR) M=`pwd`/$(OBJDIR) modules $(KERNEL_ARCH)" >> $(OBJDIR)/Makefile
 	@echo Invoking kbuild...
-	make -C $(OBJDIR)
+	$(MAKE) -C $(OBJDIR)
 
 ../lib/$(app).ko: $(LIB) $(OBJDIR)/$(app).ko
 	cp $(OBJDIR)/$(app).ko ../lib
 
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m | $(OBJDIRS)
 	$(CC) $($(APP)_CFLAGS) \
 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
 		$(subst /,$(HOST_PSEP),$<) 
 
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c | $(OBJDIRS)
 	$(CC) $($(APP)_CFLAGS) \
 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
 		$(subst /,$(HOST_PSEP),$<) 
 
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp
-	$(CC) $($(APP)_CXXFLAGS) \
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S | $(OBJDIRS)
+	$(CC) $($(APP)_CFLAGS) \
+		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
+		$(subst /,$(HOST_PSEP),$<) 
+
+$(OBJDIR)/dshowclasses.o: $(SRCDIR)/dshowclasses.cpp | $(OBJDIRS)
+	$(CXX) $($(APP)_CXXFLAGS) -I$(SRCDIR)/../../../third_party/BaseClasses -fpermissive \
+		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
+		$(subst /,$(HOST_PSEP),$<)
+
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp | $(OBJDIRS)
+	$(CXX) $($(APP)_CXXFLAGS) \
+		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
+		$(subst /,$(HOST_PSEP),$<)
+
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc | $(OBJDIRS)
+	$(CXX) $($(APP)_CXXFLAGS) \
 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
 		$(subst /,$(HOST_PSEP),$<)
 
 $(OBJDIRS):
-	$(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 
+	$(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))
 
 $(LIBDIR):
-	$(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR))
+	$(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))
 
 $(BINDIR):
-	$(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR))
+	$(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))
 
 clean:
 	$(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)/*),$(HOST_RMR))
@@ -147,7 +206,18 @@ gcov-report:
 	done
 
 realclean: clean
-	$(subst @@,$(subst /,$(HOST_PSEP),$(LIB)) $(subst /,$(HOST_PSEP),$(EXE)),$(HOST_RM))
+ifneq ($(LIB),)
+	$(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB)),$(HOST_RM))
+endif
+ifneq ($(SHLIB),)
+	$(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB)),$(HOST_RM))
+endif
+ifneq ($(SONAME),)
+	$(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME)),$(HOST_RM))
+endif
+ifneq ($(EXE),)
+	$(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)),$(HOST_RM))
+endif
 	$(subst @@,$(DEP_FILE),$(HOST_RM))
 ifeq ($(OS_NAME),linux-kernel)
 	rm -f ../lib/$(app).ko
@@ -158,7 +228,12 @@ depend:
 	for F in $(FULL_SRCS); do \
 	   if test -f $$F; then \
 	     echo "$(OBJDIR)/" | tr -d '\n' >> $(DEP_FILE); \
-	     if $(CC) -M $(DEPFLAGS) $$F | sed '/^#/d' >> $(DEP_FILE); then \
+	     if echo $$F | grep -q "\.c[c|pp]"; then \
+		dep="$(CXX) -M $(DEPCXXFLAGS) $$F"; \
+	     else \
+		dep="$(CC) -M $(DEPCFLAGS) $$F"; \
+	     fi; \
+	     if eval $$dep | sed '/^#/d' >> $(DEP_FILE); then \
 		true; \
 	     else \
 		echo 'err:' >> $(DEP_FILE); \

build/vs/pjproject-vs14-api-def.props

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup>
+    <!-- 
+     - Set the API Family here:
+     * WinDesktop   (Desktop)
+     * UWP          (UWP)
+     * WinPhone8    (Windows Phone 8)
+    -->
+    <API_Family>WinDesktop</API_Family>
+  </PropertyGroup>
+</Project>

build/vs/pjproject-vs14-arm-common-defaults.props

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">    
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <TargetCPU>ARMv7</TargetCPU>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="TargetCPU">
+      <Value>$(TargetCPU)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/vs/pjproject-vs14-arm-release-defaults.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-arm-common-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>

build/vs/pjproject-vs14-arm64-common-defaults.props

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <TargetCPU>ARM64</TargetCPU>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+    <Lib>
+      <AdditionalOptions>/ignore:4221</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="TargetCPU">
+      <Value>$(TargetCPU)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/vs/pjproject-vs14-arm64-release-defaults.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-arm64-common-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>

build/vs/pjproject-vs14-build-targets.targets

@@ -0,0 +1,9 @@
+<!--This will define targets to override the default ones useful to skipped the target of specific project-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="Build">
+    <Message Text="Skipped project build"></Message>
+  </Target>  
+  <Target Name="Clean">
+    <Message Text="Skipped project clean"></Message>
+  </Target>   
+</Project>

build/vs/pjproject-vs14-common-config.props

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-api-def.props" />
+  </ImportGroup>  
+  <Choose>
+    <When Condition="'$(Platform)'=='ARM' ">
+      <PropertyGroup>
+        <API_Family Condition="'$(API_Family)'=='WinDesktop'">UWP</API_Family>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">
+      <PropertyGroup>
+        <API_Family Condition="'$(API_Family)'=='WinPhone8'">UWP</API_Family>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <PropertyGroup>    
+    <API_Family Condition="'$(API_Family)'==''">WinDesktop</API_Family>
+    <PreprocessorDef></PreprocessorDef>
+    <DefaultToolset>v140</DefaultToolset>
+  </PropertyGroup>  
+  <Choose>
+    <When Condition="'$(API_Family)'=='WinDesktop'">
+      <PropertyGroup>
+        <BuildToolset>v140</BuildToolset>
+        <PreprocessorDef Condition="'$(Platform)'=='Win32'">WIN32;PJ_WIN32=1;PJ_M_I386=1;</PreprocessorDef>
+        <PreprocessorDef Condition="'$(Platform)'=='x64'">WIN64;PJ_WIN64=1;PJ_M_X86_64=1;</PreprocessorDef>
+	<PreprocessorDef Condition="'$(Platform)'=='ARM64'">PJ_M_ARM64=1;</PreprocessorDef>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(API_Family)'=='UWP'">
+      <PropertyGroup>
+        <BuildToolset>v140</BuildToolset>
+        <PreprocessorDef>PJ_WIN32_UWP;UNICODE;_UNICODE;</PreprocessorDef>
+        <PreprocessorDef Condition="'$(Platform)'=='ARM'">$(PreprocessorDef);PJ_M_ARMV7=1;</PreprocessorDef>
+        <PlatformVersion>10.0.10586.0</PlatformVersion>
+        <MinPlatformVersion>10.0.10240.0</MinPlatformVersion>
+        <AppTypeRev>10.0</AppTypeRev>
+        
+        <WindowsTargetPlatformVersion>$(PlatformVersion)</WindowsTargetPlatformVersion>
+        <WindowsTargetPlatformMinVersion>$(MinPlatformVersion)</WindowsTargetPlatformMinVersion>
+        <AppContainerApplication>true</AppContainerApplication>
+        <ApplicationType>Windows Store</ApplicationType>
+        <ApplicationTypeRevision>$(AppTypeRev)</ApplicationTypeRevision>
+        
+        <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+        <TargetPlatformVersion>$(PlatformVersion)</TargetPlatformVersion>
+        <TargetPlatformMinVersion>$(MinPlatformVersion)</TargetPlatformMinVersion>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(API_Family)'=='WinPhone8'">
+      <PropertyGroup>
+        <BuildToolset>v110_wp80</BuildToolset>
+        <PreprocessorDef>PJ_WIN32_WINPHONE8;PJ_M_ARMV7=1;UNICODE;_UNICODE;</PreprocessorDef>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>$(PreprocessorDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild Condition="'$(API_Family)'=='UWP'">false</MinimalRebuild>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>

build/vs/pjproject-vs14-common-defaults.props

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <VSVer>14</VSVer>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+    <OutDir Condition="'$(TargetExt)'=='.lib'">..\lib\</OutDir>
+    <OutDir Condition="'$(TargetExt)'=='.exe'">..\bin\</OutDir>
+    <OutDir Condition="'$(TargetExt)'=='.dll'">..\lib\</OutDir>
+    <TargetName>$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+    <IntDir>.\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <CompileAs>Default</CompileAs>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <SDLCheck>false</SDLCheck>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+    <Link>
+      <OutputFile  Condition="'$(TargetExt)'=='.exe'">..\bin\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+      <GenerateWindowsMetadata Condition="'$(TargetExt)'=='.lib'">false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="VSVer">
+      <Value>$(VSVer)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/vs/pjproject-vs14-common-targets.targets

@@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CheckAPI">
+    <Message Condition="'$(API_Family)'!='$(PROJ_Target)'" Text="Skipped project build"></Message>
+    <CallTarget Condition="'$(API_Family)'=='$(PROJ_Target)'" Targets="Build"/>
+  </Target>
+</Project>

build/vs/pjproject-vs14-debug-defaults.props

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-common-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

build/vs/pjproject-vs14-debug-dynamic-defaults.props

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-debug-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

build/vs/pjproject-vs14-debug-static-defaults.props

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-debug-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

build/vs/pjproject-vs14-release-defaults.props

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-common-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

build/vs/pjproject-vs14-release-dynamic-defaults.props

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-release-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

build/vs/pjproject-vs14-release-static-defaults.props

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-release-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

build/vs/pjproject-vs14-win32-common-defaults.props

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <TargetCPU>i386</TargetCPU>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Lib>
+      <AdditionalOptions>/ignore:4221</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="TargetCPU">
+      <Value>$(TargetCPU)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/vs/pjproject-vs14-win32-release-defaults.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-win32-common-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>

build/vs/pjproject-vs14-win64-common-defaults.props

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <TargetCPU>x86_64</TargetCPU>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+    <Lib>
+      <AdditionalOptions>/ignore:4221</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="TargetCPU">
+      <Value>$(TargetCPU)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/vs/pjproject-vs14-win64-release-defaults.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-win64-common-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>

build/vs/pjproject-vs8-common-defaults.vsprops

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-common-defaults"
+	OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName)"
+	IntermediateDirectory="$(OutDir)"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		BrowseInformation="1"
+		WarningLevel="4"
+		CompileAs="0"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		OutputFile="..\bin\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+	/>
+	<UserMacro
+		Name="VSVer"
+		Value="8"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-debug-defaults.vsprops

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-debug-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-common-defaults.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		PreprocessorDefinitions="_DEBUG;DEBUG"
+		DebugInformationFormat="4"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-debug-dynamic-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-debug-defaults.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		RuntimeLibrary="3"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-debug-static-defaults.vsprops

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-debug-static-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-debug-defaults.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		RuntimeLibrary="1"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-release-defaults.vsprops

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-release-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-common-defaults.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		PreprocessorDefinitions="NDEBUG"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="1"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-release-dynamic-defaults.vsprops

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-release-dynamic-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-release-defaults.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		RuntimeLibrary="2"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-release-static-defaults.vsprops

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-release-static-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-release-defaults.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		RuntimeLibrary="0"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-win32-common-defaults.vsprops

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-win32-common-defaults"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="WIN32;PJ_WIN32=1;PJ_M_I386=1;"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		SubSystem="1"
+		TargetMachine="1"
+	/>
+	<UserMacro
+		Name="TargetCPU"
+		Value="i386"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-win32-release-defaults.vsprops

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-win32-release-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-win32-common-defaults.vsprops"
+	>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-win64-common-defaults.vsprops

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-win64-common-defaults"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="WIN64;PJ_WIN64=1;PJ_M_X86_64=1;"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		SubSystem="1"
+		TargetMachine="17"
+	/>
+	<UserMacro
+		Name="TargetCPU"
+		Value="x86_64"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-win64-release-defaults.vsprops

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-win64-release-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-win64-common-defaults.vsprops"
+	>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-wm2003-common-defaults.vsprops

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-wm2003-common-defaults"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
+		DebugInformationFormat="3"
+		DisableSpecificWarnings="4214;4201"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="secchk.lib ccrtrtti.lib"
+		SubSystem="9"
+		StackReserveSize="65536"
+		StackCommitSize="4096"
+		EntryPointSymbol="WinMainCRTStartup"
+		TargetMachine="3"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
+	/>
+	<UserMacro
+		Name="TargetCPU"
+		Value="armv4"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-wm2003-release-defaults.vsprops

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-wm2003-release-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-wm2003-common-defaults.vsprops"
+	>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-wm5-common-defaults.vsprops

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-wm5-common-defaults"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
+		DebugInformationFormat="3"
+		DisableSpecificWarnings="4214;4201"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		SubSystem="9"
+		StackReserveSize="65536"
+		StackCommitSize="4096"
+		EntryPointSymbol="WinMainCRTStartup"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
+	/>
+	<UserMacro
+		Name="TargetCPU"
+		Value="armv4i"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-wm5-release-defaults.vsprops

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-wm5-release-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-wm5-common-defaults.vsprops"
+	>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-wm6-common-defaults.vsprops

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-wm6-common-defaults"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
+		DebugInformationFormat="3"
+		DisableSpecificWarnings="4214;4201"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		SubSystem="9"
+		StackReserveSize="65536"
+		StackCommitSize="4096"
+		EntryPointSymbol="WinMainCRTStartup"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
+	/>
+	<UserMacro
+		Name="TargetCPU"
+		Value="armv4i"
+	/>
+</VisualStudioPropertySheet>

build/vs/pjproject-vs8-wm6-release-defaults.vsprops

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjproject-vs8-wm6-release-defaults"
+	InheritedPropertySheets=".\pjproject-vs8-wm6-common-defaults.vsprops"
+	>
+</VisualStudioPropertySheet>

config.sub

@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2005-04-22'
+timestamp='2012-06-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -20,23 +21,25 @@ timestamp='2005-04-22'
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -70,7 +73,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +87,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +103,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,11 +122,18 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -145,10 +156,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+	-bluegene*)
+		os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -163,13 +177,17 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -186,6 +204,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -203,6 +225,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -227,26 +255,36 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm64 | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | armv[67] | armv7s | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| epiphany \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -255,31 +293,65 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| open8 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -295,32 +367,40 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| arm-*  | arm64-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -329,27 +409,38 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
-	| v850-* | v850e-* | vax-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -367,7 +458,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -413,6 +504,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -421,10 +516,35 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -453,8 +573,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -492,6 +612,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -607,7 +731,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -646,6 +769,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -657,10 +788,17 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -686,10 +824,21 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -754,6 +903,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -761,9 +916,8 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -785,6 +939,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -794,6 +956,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -823,9 +991,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -850,6 +1019,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -876,6 +1049,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -887,6 +1064,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -908,6 +1088,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -964,17 +1147,9 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
@@ -1043,6 +1218,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1051,6 +1229,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1089,13 +1271,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1139,9 +1318,12 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1162,26 +1344,31 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1199,7 +1386,7 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1220,7 +1407,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1269,7 +1456,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1311,6 +1498,11 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1333,6 +1525,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1342,9 +1540,21 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1363,13 +1573,13 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
+	mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
@@ -1388,10 +1598,13 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
@@ -1496,7 +1709,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
@@ -1559,7 +1772,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)

configure

@@ -1,5 +1,5 @@
 #!/bin/sh
-./aconfigure $*
+./aconfigure "$@"
 
 # Note:
 # if you're looking for the old configure script, it has been renamed

configure-android

@@ -0,0 +1,387 @@
+#!/bin/sh
+#
+
+F="configure-android"
+IS_USING_LLVM="0"
+
+if test "$*" = "--help" -o "$*" = "-h"; then
+  echo "$F [--use-ndk-cflags] [OPTIONS]"
+  echo ""
+  echo "where:"
+  echo "  --use-ndk-cflags Optional parameter to use the same compilation flags"
+  echo "              	   as the one used by ndk-build. Android NDK r9 or later"   
+  echo "                   is required when using this option."
+  echo "  OPTIONS     	   Other options that will be passed directly to"
+  echo "                   ./aconfigure script. Run ./aconfigure --help"
+  echo "                   for more info."
+  echo ""
+  echo "Environment variables:"
+  echo "  ANDROID_NDK_ROOT Specify the directory of Android NDK to use."
+  echo "  APP_PLATFORM     Optionally specify the platform level used, e.g."
+  echo "                   android-9. By default, configure will use the"
+  echo "                   maximum platform level detected."
+  echo "  TARGET_ABI       Optionally specify a single target architecture,"
+  echo "                   e.g. armeabi-v7a, arm64-v8a, mips, x86. By default, "
+  echo "                   the target architecture is arm64-v8a."
+  echo "  IGNORE_CFLAGS    Optionally specify compilation flags to be ignored."
+  echo "                   Each grepped flag that satisfies the criteria will"
+  echo "                   be ignored. Default:"
+  echo "                   IGNORE_CFLAGS=\"\-M\|\-f*stack\|\-f*alias\|\-\<g\>\""
+  echo "                   Only used when --use-ndk-cflags is specified."
+  echo ""
+  exit 0
+fi
+
+if test "x${ANDROID_NDK_ROOT}" = "x" || test ! -e ${ANDROID_NDK_ROOT}; then
+  echo "$F error: ANDROID_NDK_ROOT env var is not specified or invalid"
+  exit 0
+fi
+
+# The BRE version somehow does not work well on MacOSX
+#NDK_VER=`sed -n -e 's/.*Pkg.Revision *= *\([0-9]\+\).*/\1/p' ${ANDROID_NDK_ROOT}/source.properties`
+NDK_VER=`sed -n -E 's/^Pkg.Revision *= *([0-9]+).*/\1/p' ${ANDROID_NDK_ROOT}/source.properties`
+
+if test "x$APP_PLATFORM" = "x"; then
+  if test -d ${ANDROID_NDK_ROOT}/platforms; then
+    APP_PLATFORM=`ls ${ANDROID_NDK_ROOT}/platforms/ | sed 's/android-//' | sort -gr | head -1`
+  fi
+  if test "x$APP_PLATFORM" != "x"; then
+    APP_PLATFORM="android-${APP_PLATFORM}"
+  else
+    APP_PLATFORM="latest"
+  fi
+  echo "$F: APP_PLATFORM not specified, using ${APP_PLATFORM}"
+fi
+
+if test "x$TARGET_ABI" = "x"; then
+  TARGET_ABI="arm64-v8a"
+  echo "$F: TARGET_ABI not specified, using ${TARGET_ABI}"
+fi
+
+if test "$TARGET_ABI" = "x86_64" || test "$TARGET_ABI" = "mips64"; then       
+    USR_LIB="/usr/lib64"
+else
+    USR_LIB="/usr/lib"
+fi
+
+
+if test "$1" = "--use-ndk-cflags" || [ "${NDK_VER}" -ge "17" ]; then
+  if test "$1" = "--use-ndk-cflags"; then
+    shift # don't pass this param to main configure script
+  fi
+
+  ADD_CFLAGS="0"
+  ADD_CXXFLAGS="0"
+  ADD_LDFLAGS="0"
+  ADD_NDK_TOOLCHAIN="0"
+  ADD_NDK_TARGET="0"
+  if test "x${IGNORE_CFLAGS}" = "x"; then
+    IGNORE_CFLAGS="\-M\|\-f*stack\|\-f*alias\|\-\<g\>\|\-DNDEBUG\|\-O"
+  fi
+  if test "x${IGNORE_CPPFLAGS}" = "x"; then
+    IGNORE_CPPFLAGS="\-M\|\-f*stack\|\-f*alias\|\-\<g\>\|\-DNDEBUG\|\-O\|\-std\="
+  fi
+  
+  if test -f ${ANDROID_NDK_ROOT}/build/ndk-build; then    
+    NDK_BUILD=${ANDROID_NDK_ROOT}/build/ndk-build
+  else 
+    NDK_BUILD=${ANDROID_NDK_ROOT}/ndk-build
+  fi
+
+  NDK_OUT=`${NDK_BUILD} -n -C pjsip-apps/src/samples/android_sample APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}`
+  if test ! "${NDK_OUT}"; then
+    echo "$F error: failed to run ndk-build, check ANDROID_NDK_ROOT env var"
+    exit 1
+  fi
+
+  #echo "====="
+  #echo "NDK_OUT : ${NDK_OUT}"
+  #echo "====="
+
+  for i in $NDK_OUT; do
+
+    # Parse NDK CXXFLAGS
+    if test "${ADD_CXXFLAGS}" = "1"; then
+      if test "$i" = "-o"; then
+        ADD_CXXFLAGS="0"
+        continue
+      fi
+      if test "$i" = "-c"; then
+        continue
+      fi
+      if test "x`echo $i|grep 'dummy'`" != "x"; then
+        continue
+      fi
+      if test "x`echo $i|grep ${IGNORE_CPPFLAGS}`" != "x"; then
+        continue
+      fi
+      # Check if flag is already in CFLAGS
+      ISDUP="0"
+      for j in $NDK_CFLAGS; do
+        if test "$i" = "$j"; then
+	  ISDUP="1"
+	  break
+	fi
+      done
+      if test "${ISDUP}" = "1"; then
+        continue
+      fi
+      NDK_CXXFLAGS="${NDK_CXXFLAGS} $i"
+      continue
+    fi
+
+    # Parse NDK CFLAGS
+    if test "${ADD_CFLAGS}" = "1"; then
+      if test "$i" = "-c"; then
+        ADD_CFLAGS="0"
+        continue
+      fi
+      if test "x`echo $i|grep 'dummy'`" != "x"; then
+        continue
+      fi
+      if test "x`echo $i|grep ${IGNORE_CFLAGS}`" = "x"; then
+          if test "${ADD_NDK_TOOLCHAIN}" = "0" -a "x`echo $i|grep '\-gcc-toolchain'`" != "x"; then
+            ADD_NDK_TOOLCHAIN="1"
+          elif test "${ADD_NDK_TARGET}" = "0" -a "x`echo $i|grep '\-target'`" != "x"; then          
+            ADD_NDK_TARGET="1"
+          elif test "${ADD_NDK_TOOLCHAIN}" = "1"; then
+            NDK_TOOLCHAIN="$i"
+            ADD_NDK_TOOLCHAIN="2"
+          elif test "${ADD_NDK_TARGET}" = "1"; then
+            NDK_TARGET="$i"
+            ADD_NDK_TARGET="2"
+          fi
+          NDK_CFLAGS="${NDK_CFLAGS} $i"
+      fi
+      continue
+    fi
+
+    # Parse NDK LDFLAGS
+    if test "${ADD_LDFLAGS}" = "1"; then
+      if test "$i" = "-o"; then
+        ADD_LDFLAGS="0"
+        continue
+      fi
+      if test "x`echo $i|grep 'dummy'`" != "x"; then
+        continue
+      fi
+      if test "x`echo $i|grep '.so'`" != "x"; then
+        continue
+      fi
+      NDK_LDFLAGS="${NDK_LDFLAGS} $i"
+      continue
+    fi
+
+    # Find gcc or clang
+    if test "x${NDK_CC}" = "x"; then
+      if test "x`echo $i | grep 'gcc'`" != "x" -o "x`echo $i | grep 'clang'`" != "x"; then
+        NDK_CC=$i
+        ADD_CFLAGS="1"
+	if test "x`echo ${NDK_CC} | grep 'clang'`" != "x"; then
+	  IS_USING_LLVM="1"
+	  #echo "---using llvm"
+	fi
+	continue
+      fi
+    fi
+
+    # Find g++ or clang++
+    if test "x${NDK_CXX}" = "x"; then
+      if test "x`echo $i | grep 'g++'`" != "x"; then
+        NDK_CXX=$i
+        ADD_CXXFLAGS="1"
+	continue
+      fi
+    fi
+
+    # Find linking/LDFLAGS
+    if test "x${NDK_LDFLAGS}" = "x"; then
+      if test "x`echo $i | grep '\-\<shared\>'`" != "x"; then
+        ADD_LDFLAGS="1"
+	continue
+      fi
+    fi
+
+    # Find ar tool
+    if test "x${NDK_AR}" = "x" -a "x${NDK_CC}" != "x" -a "x`echo $i|grep '\-\<ar\>'`" != "x"; then
+      # In some NDKs, e.g: r17c, gcc/clang and ar have different path
+      #if test "$(dirname \"${NDK_CC}\")" = "$(dirname \"${i}\")"; then
+        NDK_AR=$i
+        #echo "--- found AR=${NDK_AR}"
+	continue
+      #fi
+    fi
+
+    # Find ranlib tool
+    if test "x${NDK_RANLIB}" = "x" -a "x${NDK_CC}" != "x" -a "x`echo $i|grep '\-\<ranlib\>'`" != "x"; then
+      #if test "$(dirname \"${NDK_CC}\")" = "$(dirname \"${i}\")"; then
+        NDK_RANLIB=$i
+        #echo "--- found RANLIB=${NDK_RANLIB}"
+      #fi
+    fi
+
+    # Get STD C++ lib path
+    if test "x${STD_CPP_LIB}" = "x"; then
+      if test "x`echo $i | grep 'libc++_shared.so'`" != "x"; then
+        MY_CONF_TMP=`echo ${i} | sed -e 's/\\\/\\//g' | sed -e 's/\\"//g'`
+        if test -e $MY_CONF_TMP; then
+          STD_CPP_LIB=$MY_CONF_TMP
+        #else
+          #echo "--- not good path for libc++_shared.so: ${MY_CONF_TMP}"
+        fi
+      fi
+    fi
+  done
+
+  # Get target host from NDK toolchain dir name
+  TARGET_HOST=`echo ${NDK_CC} | sed -e 's/.*\/toolchains\/\([^\/]*\).*/\1/'`
+  
+  # Remove version number suffix (otherwise config.sub will return error, perhaps it just doesn't like the format)
+  TARGET_HOST=`echo ${TARGET_HOST} | sed -e 's/\-[0-9\.]*$//'`
+
+  # Get target from '-target' param when TARGET_HOST is 'llvm'
+  if test "$TARGET_HOST" = "llvm"; then
+    TARGET_HOST=`echo ${NDK_CFLAGS} | sed -e 's/.*-target \([^- ]*\).*/\1/'`
+  fi
+
+  # Make sure target host string has 'linux-android' in it
+  if test "x`echo ${TARGET_HOST} | grep 'linux-android'`" = "x"; then
+    #TARGET_HOST=`echo ${TARGET_HOST} | sed -e 's/\(.*\)\-\([0-9\.]*\)/\1-linux-android-\2/'`
+    TARGET_HOST="${TARGET_HOST}-linux-android"
+  fi
+
+  # Set the binutils
+  if test "x${NDK_TOOLCHAIN}" = "x"; then
+    if test "x${NDK_AR}" = "x"; then
+      NDK_CC_DIR=$(dirname "${NDK_CC}")
+      NDK_AR=`find ${NDK_CC_DIR} -name "*ar" | grep -m 1 -v "gcc"`
+    fi
+    export LDFLAGS="${LDFLAGS}"
+  else
+    # find ar and ranlib
+    if test "x${NDK_AR}" = "x"; then
+      NDK_AR=`find ${NDK_TOOLCHAIN}/bin/ -name "*-ar" | grep -m 1 -v "gcc"`
+    fi
+    if test "x${NDK_RANLIB}" = "x"; then
+      NDK_RANLIB=`find ${NDK_TOOLCHAIN}/bin/ -name "*-ranlib" | grep -m 1 -v "gcc"`
+    fi
+    export LDFLAGS="${LDFLAGS} -target ${NDK_TARGET} -gcc-toolchain ${NDK_TOOLCHAIN}"
+  fi
+
+  if test "x${NDK_RANLIB}" = "x"; then
+    NDK_RANLIB="${NDK_AR} s"
+  fi
+
+  TC_AR=${NDK_AR}
+  TC_RANLIB=${NDK_RANLIB}
+  if test "x${TC_AR}" != "x" -a "x${TC_RANLIB}" != "x"; then
+    export AR="${TC_AR}"
+    export RANLIB="${TC_RANLIB}"
+  fi
+
+  export TARGET_ABI="${TARGET_ABI}"
+  export CC="${NDK_CC}"
+  export CXX="${NDK_CXX}"
+
+  export CPPFLAGS="${CPPFLAGS}"
+  export CFLAGS="${NDK_CFLAGS} ${CFLAGS} ${CPPFLAGS}"
+  export CXXFLAGS="${NDK_CXXFLAGS} ${CPPFLAGS}"
+  export LDFLAGS="${NDK_LDFLAGS} ${LDFLAGS}"
+  export LIBS="${LIBS}"
+
+else
+
+  if test "$TARGET_ABI" != "armeabi"; then
+    echo "$F error: For targets other than 'armeabi', specify --use-ndk-cflags"
+    exit 1
+  fi
+  
+  TARGET_HOST="arm-linux-androideabi"
+  
+  ANDROID_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/toolchains/${TARGET_HOST}-* | sed 's/clang/0/' | sort -gr | head -1`
+  ANDROID_TC=`ls -d ${ANDROID_TC_VER}/prebuilt/* | grep -v gdbserver | head -1`
+  if test ! -d ${ANDROID_TC}; then
+    echo "$F error: unable to find directory ${ANDROID_TC} in Android NDK"
+    exit 1
+  fi
+
+  export ANDROID_SYSROOT="${ANDROID_NDK_ROOT}/platforms/${APP_PLATFORM}/arch-arm"
+  if test ! -d ${ANDROID_SYSROOT}; then
+    echo "$F error: unable to find sysroot dir ${ANDROID_SYSROOT} in Android NDK"
+    exit 1
+  fi
+
+  export TARGET_ABI="${TARGET_ABI}"
+  export CC="${ANDROID_TC}/bin/${TARGET_HOST}-gcc"
+  export CXX="${ANDROID_TC}/bin/${TARGET_HOST}-g++"
+  export AR="${ANDROID_TC}/bin/${TARGET_HOST}-ar"
+  export RANLIB="${ANDROID_TC}/bin/${TARGET_HOST}-ranlib"
+
+  export LDFLAGS="${LDFLAGS} --sysroot=${ANDROID_SYSROOT}"
+  export LIBS="${LIBS} -lc -lgcc"
+  export CFLAGS="${CFLAGS} --sysroot=${ANDROID_SYSROOT}"
+  export CPPFLAGS="${CFLAGS} -fexceptions -frtti"
+  export CXXFLAGS="${CXXFLAGS} -shared --sysroot=${ANDROID_SYSROOT} -fexceptions -frtti"
+
+fi
+
+if test "x${CC}" = "x" || test ! -e ${CC}; then
+  echo "$F error: compiler not found, please check environment settings (TARGET_ABI, etc)"
+  exit 1
+fi
+
+# C++ STL
+# Note: STL for pjsua2 sample app is specified in pjsip-apps/src/swig/java/android/jni/Application.mk
+
+if test "${IS_USING_LLVM}" = "1"; then
+  # llvm
+  STDCPP_TC="${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++"
+  #STDCPP_CFLAGS="-I${STDCPP_TC}/include"
+  #STDCPP_LIBS="-lc++_static -lc++abi"
+  #STDCPP_LIBS="${STDCPP_TC}/libs/${TARGET_ABI}/libc++_shared.so"
+  STDCPP_LIBS="${STD_CPP_LIB}"
+  #STDCPP_LDFLAGS="-L${STDCPP_TC}/libs/${TARGET_ABI}/"
+else
+  # gnustl
+  STDCPP_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/[0-9]* | sort -gr | head -1`
+  STDCPP_CFLAGS="-I${STDCPP_TC_VER}/include -I${STDCPP_TC_VER}/libs/${TARGET_ABI}/include"
+  STDCPP_LIBS="-lgnustl_static"
+  STDCPP_LDFLAGS="-L${STDCPP_TC_VER}/libs/${TARGET_ABI}/"
+fi
+
+if test "x$AR_FLAGS" = "x"; then
+  AR_FLAGS="rvc"
+fi
+
+# stlport
+#STDCPP_CFLAGS="-I${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/stlport"
+#STDCPP_LIBS="-lstlport_static -ldl"
+#STDCPP_LDFLAGS="-L${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/${TARGET_ABI}"
+
+export CFLAGS="${CFLAGS}"
+export LIBS="${LIBS} ${STDCPP_LIBS}"
+export LDFLAGS="${LDFLAGS} ${STDCPP_LDFLAGS}"
+export CPPFLAGS="${CPPFLAGS}"
+export CXXFLAGS="${CXXFLAGS} ${STDCPP_CFLAGS}"
+export STD_CPP_LIB="${STD_CPP_LIB}"
+export AR_FLAGS="${AR_FLAGS}"
+
+# Print settings
+if test "1" = "1"; then
+  echo "$F: calling ./configure with env vars:"
+  echo " NDK_TOOLCHAIN = ${NDK_TOOLCHAIN}"
+  echo " CC = ${CC}"
+  echo " CXX = ${CXX}"
+  echo " CFLAGS = ${CFLAGS}"
+  echo " CXXFLAGS = ${CXXFLAGS}"
+  echo " STD_CPP_LIB = ${STD_CPP_LIB}"
+  echo " LDFLAGS = ${LDFLAGS}"
+  echo " LIBS = ${LIBS}"
+  echo " AR = ${AR}"
+  echo " AR_FLAGS = ${AR_FLAGS}"
+  echo " RANLIB = ${RANLIB}"
+  echo " TARGET_HOST = ${TARGET_HOST}"
+  echo " TARGET_ABI = ${TARGET_ABI}"
+fi
+
+./configure --host=${TARGET_HOST} $*

configure-iphone

@@ -0,0 +1,172 @@
+#!/bin/bash
+
+F="configure-iphone"
+
+if test "$*" = "--help" -o "$*" = "-h"; then
+  echo "$F [OPTIONS]"
+  echo ""
+  echo "where:"
+  echo "  OPTIONS    Other options that will be passed directly to"
+  echo "             ./aconfigure script. Run ./aconfigure --help"
+  echo "             for more info."
+  echo ""
+  echo "Environment variables:"
+  echo "  IPHONESDK  Optionally specify which SDK to use. Value is the full "
+  echo "             path of the SDK. By default, the latest SDK installed"
+  echo "             will be used."
+  echo "  CC         Optionally specify the path of the ARM cross compiler"
+  echo "             to use. By default, the compiler is deduced from the"
+  echo "             SDK."
+  echo "  ARCH       Optional flags to specify target architecture, e.g."
+  echo "             ARCH=\"-arch armv7\". Default is arm64."
+  echo "  MIN_IOS    Optional flags to specify minimum supported iOS"
+  echo "             versions, e.g. MIN_IOS=\"-miphoneos-version-min=11.0\". "
+  echo "             Default is 11.0."
+  echo ""
+  exit 0
+fi
+
+# Set the main iPhone developer directory, if not set
+if test "x${DEVPATH}" = "x"; then
+  DEVPATH=/Applications/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer
+  if test  ! -d $DEVPATH; then
+    DEVPATH=/Developer/Platforms/iPhoneOS.platform/Developer
+  fi
+  echo "$F: DEVPATH is not specified, using ${DEVPATH}"
+fi
+
+# Make sure $DEVPATH directory exist
+if test ! -d $DEVPATH; then
+  echo "$F error: directory $DEVPATH does not exist. Please install iPhone development kit"
+  exit 1
+fi
+
+# Choose SDK version to use
+if test "$IPHONESDK" = ""; then
+  # If IPHONESDK is not set, use the latest one
+  for f in `ls $DEVPATH/SDKs/`; do echo $f | sed 's/\(.sdk\)//'; done | sort | tail -1 > tmpsdkname
+  IPHONESDK=`cat tmpsdkname`.sdk
+  rm -f tmpsdkname
+  SDKPATH=${DEVPATH}/SDKs/${IPHONESDK}
+  echo "$F: IPHONESDK is not specified, choosing ${IPHONESDK}"
+elif test -d ${IPHONESDK}; then
+  # .. else if IPHONESDK is set and it points to a valid path, just use it
+  SDKPATH=${IPHONESDK}
+else
+  # .. else assume the SDK name is used.
+  SDKPATH=${DEVPATH}/SDKs/${IPHONESDK}
+fi
+
+# Test the SDK directory
+if test ! -d ${SDKPATH}/usr/include; then
+  echo "$F error: unable to find valid iPhone SDK in ${SDKPATH}"
+  exit 1
+fi
+
+# Default CFLAGS if it's not specified
+if test "$CFLAGS" = ""; then
+  CFLAGS="-O2 -Wno-unused-label"
+fi
+
+# Default LDFLAGS if it's not specified
+if test "$LDFLAGS" = ""; then
+  LDFLAGS="-O2"
+fi
+
+# Test the toolchain directory
+TCPATH="${DEVPATH}/../../../Toolchains/XcodeDefault.xctoolchain"
+if test ! -d ${TCPATH}/usr/bin; then
+  TCPATH="${DEVPATH}"
+fi
+
+# Determine which gcc for this SDK. Binaries should have the
+# full path as it's not normally in user's PATH
+
+if test "${CC}" = ""; then
+  # Try to use clang if available
+  ccpath="${TCPATH}/usr/bin/clang"
+  # Next, try to use llvm-gcc
+  gccpath="${DEVPATH}/usr/bin/llvm-gcc"
+  if test -e ${ccpath}; then
+    export CC="${ccpath}" 
+  elif test -e ${gccpath}; then
+    export CC="${gccpath}"
+  else
+    for archpath in `ls -d ${SDKPATH}/usr/lib/gcc/arm-apple-darwin*`; do
+       archname=`basename ${archpath}`
+       for gccver in `ls ${archpath}`; do
+          gccpath="${DEVPATH}/usr/bin/${archname}-gcc-${gccver}"
+          if test -e ${gccpath}; then
+            export CC="${gccpath}"
+          fi
+       done
+    done
+  fi
+  if test ! "${CC}" = ""; then
+    echo "$F: CC is not specified, choosing ${CC}"
+  fi
+fi
+
+if test "${CC}" = ""; then
+    echo "$F error: unable to find gcc for ${IPHONESDK}. If you think you have the right gcc, set the full path in CC environment variable."
+    exit 1
+fi
+
+if test "${ARCH}" = ""; then
+  export ARCH="-arch arm64"
+  echo "$F: ARCH is not specified, choosing ${ARCH}"
+fi
+export ARCH_VAL=`echo ${ARCH} | sed 's/\-arch //' | sed -e 's/^[ \t]*//;s/[ \t]*$//' `
+
+if test "${ARCH_VAL}" = "arm64e"; then
+ export ARCH_VAL="arm64"
+fi 
+
+if test "${MIN_IOS}" = ""; then
+  MIN_IOS_VER="11.0"
+  echo "$F: MIN_IOS is not specified, choosing ${MIN_IOS_VER}"
+  MIN_IOS="-miphoneos-version-min=${MIN_IOS_VER}"
+fi
+CFLAGS="${CFLAGS} ${MIN_IOS}"
+LDFLAGS="${LDFLAGS} ${MIN_IOS}"
+
+
+# Set CXX if not set
+if test "${CXX}" = ""; then
+  export CXX=`echo ${CC} | sed 's/clang/clang++/'`
+  echo "$F: CXX is not specified, using ${CXX}"
+fi
+
+# Other settings to feed to configure script. 
+#ARCH="-arch armv6"
+export CFLAGS="${CFLAGS} -DPJ_SDK_NAME=\"\\\"`basename $SDKPATH`\\\"\" ${ARCH} -isysroot ${SDKPATH}"
+export LDFLAGS="${LDFLAGS} ${ARCH} -isysroot ${SDKPATH} -framework AudioToolbox -framework Foundation"
+export AR="${TCPATH}/usr/bin/libtool -static -o"
+export AR_FLAGS=" "
+export RANLIB="echo ranlib"
+# Use gcc -E as preprocessor instead of cpp, since cpp will find the
+# header files in standard /usr/include instead of in isysroot
+export CPP="${CC} ${ARCH} -E -isysroot ${SDKPATH}"
+
+# Print settings
+if test "1" = "1"; then
+  echo "$F: calling ./aconfigure with env vars:"
+  echo " MIN_IOS = ${MIN_IOS}"
+  echo " CC = ${CC}"
+  echo " CXX = ${CXX}"
+  echo " SDKPATH = ${SDKPATH}"
+  echo " CFLAGS = ${CFLAGS}"
+  echo " LDFLAGS = ${LDFLAGS}"
+  echo " AR = ${AR}"
+  echo " RANLIB = ${RANLIB}"
+  echo " ARCH = ${ARCH_VAL}"
+fi
+
+# And finally invoke the configure script itself
+./aconfigure --host=${ARCH_VAL}-apple-darwin_ios --disable-sdl $*
+
+if test "$?" = "0"; then
+  echo "Done configuring for `basename $SDKPATH`"
+  echo ""
+fi
+