Removed C:\MinGW\bin from PATH #13

mxklb · Oct 12, 2018 · 9f597b1 · 9f597b1
1 parent d07b3c1
commit 9f597b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -25,7 +25,7 @@ install:
 
 build_script:
   - if [%tbs_tools%]==[msvc14] if [%tbs_arch%]==[x64] SET PATH=%PATH%;C:\Qt\5.9\msvc2015\bin;
-  - if [%tbs_tools%]==[mingw] if [%tbs_arch%]==[x32] SET PATH=%PATH%;C:\MinGW\bin;C:\Qt\5.9.5\mingw53_32\bin;
+  - if [%tbs_tools%]==[mingw] if [%tbs_arch%]==[x32] SET PATH=%PATH%;C:\Qt\5.9.5\mingw53_32\bin;
   - echo "catchTests=false" > globals.pri
   - qmake cuteproject.pro -r CONFIG+=%BUILD_TYPE%
   - jom

diff --git a/libs/loadlibs.pri b/libs/loadlibs.pri
@@ -57,13 +57,11 @@ for(lib, customLibs) {
                 PRE_TARGETDEPS += $${OUTDIR}/$${WINDIR}/$${LIBNAME}.$${LIB_EXTENSION}
             }
             gcc {
-                LIB_EXTENSION = lib
-                LIBS += $${OUTDIR}/$${WINDIR}/$${LIBNAME}.$${LIB_EXTENSION}
-                PRE_TARGETDEPS += $${OUTDIR}/$${WINDIR}/$${LIBNAME}.$${LIB_EXTENSION}
+                LIBS += $${OUTDIR}/$${WINDIR}/lib$${LIBNAME}.$${LIB_EXTENSION}
+                PRE_TARGETDEPS += $${OUTDIR}/$${WINDIR}/lib$${LIBNAME}.$${LIB_EXTENSION}
             }
         }
         unix:!macx {
-            LIBS += -L$${OUTDIR}/ -l$${LIBNAME}
             PRE_TARGETDEPS += $${OUTDIR}/lib$${LIBNAME}.$${LIB_EXTENSION}
             QMAKE_LFLAGS += "-Wl,-rpath,\'$$OUTDIR\'"
         }