Modify buidl curl

fgzhanhao · Nov 5, 2018 · 1b2a854 · 1b2a854
1 parent bdf081a
commit 1b2a854
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/ThirdLibrary b/ThirdLibrary
diff --git a/pri/ThirdLibrary.pri b/pri/ThirdLibrary.pri
@@ -117,14 +117,7 @@ myPackagesExist(QZXing) {
 include(Webrtc.pri)
 
 equals(RABBITIM_USE_LIBCURL, 1) {
-    mingw {
-        CURL_LIBS += $$system($$PKG_CONFIG --static --libs libcurl)
-        message("CURL_LIBS:$$CURL_LIBS")
-        !isEmpty(CURL_LIBS) {
-            DEFINES *= RABBITIM_USE_LIBCURL
-            LIBS += $$CURL_LIBS
-        }
-    } else : myPackagesExist(libcurl) {
+    myPackagesExist(libcurl) {
         DEFINES *= RABBITIM_USE_LIBCURL
         MYPKGCONFIG *= libcurl
     } else : msvc {
+1 −1		appveyor.yml
+1 −1		build_script/build_envsetup_android.sh
+1 −1		build_script/build_envsetup_windows_mingw.sh
+3 −4		build_script/build_libcurl.sh
+1 −1		build_script/build_openssl.sh
+8 −6		build_script/ci/build.sh