Disable vpx and opus in build_qxmpp.sh for android

README.md

@@ -13,8 +13,8 @@
 
   文件格式： $(平台)$(版本号)_$(架构)_$(QT 版本)_版本.zip
 
-    wget https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.3.0/windows_msvc15_x86_Qt5.12.8_v0.3.0.zip
+    wget https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.3.1/windows_msvc15_x86_Qt5.12.8_v0.3.1.zip
     mkdir third_windows
-    unzip windows_msvc15_x86_Qt5.12.8_v0.3.0.zip -O third_windows
+    unzip windows_msvc15_x86_Qt5.12.8_v0.3.1.zip -O third_windows
     cd third_windows
     ./change_prefix.sh    #修改前缀为正确的目录

appveyor.yml

@@ -1,10 +1,10 @@
-version: 'v0.3.0.{build}'
+version: 'v0.3.1.{build}'
 
 cache:
   - Package
 
 environment:
-  BUILD_VERSION: v0.3.0
+  BUILD_VERSION: version: 'v0.3.1.{build}'
   TimeOutMins: 2
   #ApiKey:
   #  secure: qex0da587ygmywf4315g

build_script/build_qxmpp.sh

@@ -119,8 +119,9 @@ CMAKE_PARA="${CMAKE_PARA} -DQt5Core_DIR=${QT_ROOT}/lib/cmake/Qt5Core"
 CMAKE_PARA="${CMAKE_PARA} -DQt5Widgets_DIR=${QT_ROOT}/lib/cmake/Qt5Widgets"
 CMAKE_PARA="${CMAKE_PARA} -DQt5Network_DIR=${QT_ROOT}/lib/cmake/Qt5Network"
 CMAKE_PARA="${CMAKE_PARA} -DQt5Xml_DIR=${QT_ROOT}/lib/cmake/Qt5Xml"
-CMAKE_PARA="${CMAKE_PARA} -DWITH_OPUS=ON -DWITH_VPX=ON"
-#CMAKE_PARA="${CMAKE_PARA} -DCMAKE_PREFIX_PATH=${RABBIT_BUILD_PREFIX}"
+if [ "${BUILD_TARGERT}" != "android" ]; then
+    CMAKE_PARA="${CMAKE_PARA} -DWITH_OPUS=ON -DWITH_VPX=ON"
+fi
 echo "cmake .. -DCMAKE_INSTALL_PREFIX=$RABBIT_BUILD_PREFIX -DCMAKE_BUILD_TYPE=${RABBIT_CONFIG} -G\"${GENERATORS}\" ${CMAKE_PARA}"
 if [ "${BUILD_TARGERT}" = "android" ]; then
     cmake .. \

build_script/ci/download_library.ps1

@@ -6,7 +6,7 @@ $JOB_QT_VERSION = "NO"
 $RABBIT_JOB_NAME = "Environment: "
 $number = ${env:RABBIT_NUMBER} - 1
 $RABBIT_JOB_NAME = $RABBIT_JOB_NAME + "RABBIT_NUMBER=$number"
-if ($env:APPVEYOR_BUILD_WORKER_IMAGE)
+if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2017")
 {
     $RABBIT_JOB_NAME = $RABBIT_JOB_NAME + ", APPVEYOR_BUILD_WORKER_IMAGE=$env:APPVEYOR_BUILD_WORKER_IMAGE"
 }