Modify make debug

fgzhanhao · Oct 17, 2018 · 058eb5a · 058eb5a
1 parent 1f9d843
commit 058eb5a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/ThirdLibrary b/ThirdLibrary
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,6 +7,14 @@ environment:
   matrix:
 
   ##### vs2017 #####
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    BUILD_TARGERT: windows_msvc
+    RABBIT_TOOLCHAIN_VERSION: 15
+    QT_ROOT: C:/Qt/5.10/msvc2017_64
+    RABBIT_CONFIG: Debug
+    RABBIT_ARCH: x64
+    DOWNLOAD_URL: https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.0.5/RABBIT_windows_msvc15_x64_qt5.10.1_Debug_v0.0.5.zip
+
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     BUILD_TARGERT: windows_msvc
     RABBIT_TOOLCHAIN_VERSION: 15
@@ -25,14 +33,6 @@ environment:
     RABBIT_ARCH: x64
     DOWNLOAD_URL: https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.0.5/RABBIT_windows_msvc15_x64_qt5.9.5_Release_v0.0.5.zip
 
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    BUILD_TARGERT: windows_msvc
-    RABBIT_TOOLCHAIN_VERSION: 15
-    QT_ROOT: C:/Qt/5.10/msvc2017_64
-    RABBIT_CONFIG: Debug
-    RABBIT_ARCH: x64
-    DOWNLOAD_URL: https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.0.5/RABBIT_windows_msvc15_x64_qt5.10.1_Debug_v0.0.5.zip
-
   ##### vs2015 #####  
   - BUILD_TARGERT: windows_msvc
     RABBIT_TOOLCHAIN_VERSION: 14
@@ -88,7 +88,7 @@ environment:
     QT_ROOT: C:/Qt/5.6/msvc2015
     RABBIT_CONFIG: Release
     RABBIT_ARCH: x86
-    DOWNLOAD_URL: https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.0.5/RABBIT_windows_msvc14_x64_qt5.6.3_Release_v0.0.5.zip
+    DOWNLOAD_URL: https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.0.5/RABBIT_windows_msvc14_x86_qt5.6.3_Release_v0.0.5.zip
 
   ##### vs013 #####
   - BUILD_TARGERT: windows_msvc

diff --git a/pri/ThirdLibrary.pri b/pri/ThirdLibrary.pri
@@ -19,7 +19,8 @@ equals(RABBITIM_USE_QXMPP, 1) {
         }else : msvc {
             LIBS += -lqxmpp_d0
         }
-    } else {
+    } 
+    CONFIG(release, debug|release) {
         myPackagesExist(qxmpp) {
             MYPKGCONFIG *= qxmpp
         } else : msvc {
@@ -90,16 +91,19 @@ equals(QXMPP_USE_VPX, 1) {
     }
 }
 
-myPackagesExist(libqrencode) {
+msvc {
     DEFINES *= RABBITIM_USE_LIBQRENCODE
-    MYPKGCONFIG *= libqrencode
-} else : msvc {
-    DEFINES *= RABBITIM_USE_LIBQRENCODE
-    CONFIG(debug, debug|release){
+    CONFIG(debug, debug|release) {
         LIBS *= -lqrencoded
-    } else {
+    } 
+    CONFIG(release, debug|release) {
         LIBS += -lqrencode
     }
+} else {
+    myPackagesExist(libqrencode) {
+    DEFINES *= RABBITIM_USE_LIBQRENCODE
+    MYPKGCONFIG *= libqrencode
+    } 
 }
 
 myPackagesExist(QZXing) {

diff --git a/pri/ThirdLibraryConfig.pri b/pri/ThirdLibraryConfig.pri
@@ -174,7 +174,7 @@ defineTest(myPackagesExist) {
     for(package, ARGS) {
         !system($$pkg_config --exists $$package) {
             !msvc : message("Warring: package $$package is not exist. ")
-            mingw | equals(QMAKE_HOST.os, Windows) : message("Be sure use pkg-config in mingw32?")
+            mingw | equals(QMAKE_HOST.os, Windows) : message("Warring: package $$package is not exist. Be sure use pkg-config in mingw32?")
             return(false)
         }
     }