From 757fe82c64685ed78689270103bd029c4803e996 Mon Sep 17 00:00:00 2001 From: woblight Date: Mon, 16 Jul 2018 23:33:44 +0200 Subject: [PATCH] CI: don't call wine when not needed --- CI.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI.mk b/CI.mk index 60f778f..05ba901 100644 --- a/CI.mk +++ b/CI.mk @@ -5,8 +5,8 @@ pwd:=$(shell pwd) wineenv=$(WINEPREFIX) $(WINEENV) WINEDEBUG=-all winepath=$(wineenv) winepath wine=$(WINEPATH) $(wineenv) wine -WINEPREFIX:=WINEPREFIX="$(pwd)/wine" -WINEPATH:=WINEPATH='C:\Program Files (x86)\CMake\bin;$(shell $(winepath) -w "$(pwd)/mingw32/bin");$(shell $(winepath) -w "$(pwd)/Qt/5.11.1/mingw53_32/bin");$(shell $(winepath) -w "$(pwd)/git/bin")' QTDIR='$(shell $(winepath) -w "$(pwd)/Qt/5.11.1/mingw53_32")' QTDIR="Z:$(pwd)/Qt/5.11.1/mingw53_32/" +WINEPREFIX=WINEPREFIX="$(pwd)/wine" +WINEPATH=WINEPATH='C:\Program Files (x86)\CMake\bin;$(shell $(winepath) -w "$(pwd)/mingw32/bin");$(shell $(winepath) -w "$(pwd)/Qt/5.11.1/mingw53_32/bin");$(shell $(winepath) -w "$(pwd)/git/bin")' QTDIR='$(shell $(winepath) -w "$(pwd)/Qt/5.11.1/mingw53_32")' QTDIR="Z:$(pwd)/Qt/5.11.1/mingw53_32/" qmake_opts="QMAKE_INCDIR+=Z:$(pwd)/libgit2-0.27.2/include" "QMAKE_LIBDIR+=Z:$(pwd)/libgit2-0.27.2/build/" -spec win32-g++ qmake=$(wine) $(pwd)/Qt/5.11.1/mingw53_32/bin/qmake.exe