diff --git a/CI.mk b/CI.mk index 6c42bb2..dae6824 100644 --- a/CI.mk +++ b/CI.mk @@ -6,9 +6,9 @@ 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="Z:$(pwd)/Qt/5.11.1/mingw53_32/" +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")' 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 +qmake=$(WINEPATH) $(wineenv) WINEPATH="$$WINEPATH;$(shell $(winepath) -w "$(pwd)/git/bin")" wine $(pwd)/Qt/5.11.1/mingw53_32/bin/qmake.exe .PHONY: build build: