From cfbb6938885816edab0063e55b0d390f4e678561 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 18 Sep 2016 22:32:38 +0000 Subject: [PATCH] #1109 Work in Progress on MinGW/32 daily build. --- contrib/buildserver/cmake_daily.sh | 4 ++-- contrib/buildserver/test_daily.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh index 400efb88..e472f3ba 100755 --- a/contrib/buildserver/cmake_daily.sh +++ b/contrib/buildserver/cmake_daily.sh @@ -184,14 +184,14 @@ testBuild() export CFLAGS=-m64 export CXXFLAGS=-m64 export LDFLAGS=-m64 - /c/MinGW64/msys/1.0/bin/bash.exe -c "export PATH=/c/TDM-GCC-64/bin:/c/MinGW64/bin:/c/MinGW64/msys/1.0/bin:/c/MinGW64/msys/1.0/local/bin $0" + /c/MinGW64/msys/1.0/bin/bash.exe -c "export PATH=/c/TDM-GCC-64/bin:/c/MinGW64/bin:/c/MinGW64/msys/1.0/bin:/c/MinGW64/msys/1.0/local/bin ; $0" result=$? fi if [ "$win32" == true ]; then export CFLAGS=-m32 export CXXFLAGS=-m32 export LDFLAGS=-m32 - /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:/c/cygwin64/bin:/c/Users/rmills/com:. $0" + /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:/c/cygwin64/bin:/c/Users/rmills/com:. ; $0" result=$? fi exit 0 ; # stop now. RECURSIVE will do the packaging diff --git a/contrib/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh index 214f0065..abc95071 100755 --- a/contrib/buildserver/test_daily.sh +++ b/contrib/buildserver/test_daily.sh @@ -154,14 +154,14 @@ case $PLATFORM in export CFLAGS=-m64 export CXXFLAGS=-m64 export LDFLAGS=-m64 - /c/MinGW64/msys/1.0/bin/bash.exe -c "export PATH=/c/TDM-GCC-64/bin:/c/MinGW64/bin:/c/MinGW64/msys/1.0/bin:/c/MinGW64/msys/1.0/local/bin $0" + /c/MinGW64/msys/1.0/bin/bash.exe -c "export PATH=/c/TDM-GCC-64/bin:/c/MinGW64/bin:/c/MinGW64/msys/1.0/bin:/c/MinGW64/msys/1.0/local/bin ; $0" result=$? fi if [ "$win32" == true ]; then export CFLAGS=-m32 export CXXFLAGS=-m32 export LDFLAGS=-m32 - /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:/c/cygwin64/bin:/c/Users/rmills/com:. $0" + /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:/c/cygwin64/bin:/c/Users/rmills/com:. ; $0" result=$? fi fi