diff options
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.bat | 11 |
2 files changed, 4 insertions, 17 deletions
@@ -53,11 +53,5 @@ mkdir -p qtbase || exit echo "+ cd qtbase" cd qtbase || exit -echo "+ $configure $@" -"$configure" "$@" || exit 1 - -echo "+ cd .." -cd .. - -echo "+ qtbase/bin/qmake $srcpath" -exec qtbase/bin/qmake "$srcpath" +echo "+ $configure -top-level $@" +exec "$configure" -top-level "$@" diff --git a/configure.bat b/configure.bat index 73395684..d3bb977f 100644 --- a/configure.bat +++ b/configure.bat @@ -52,17 +52,10 @@ if not exist qtbase mkdir qtbase || exit /b 1 echo + cd qtbase cd qtbase || exit /b 1 -echo + %configure% %* -call %configure% %* +echo + %configure% -top-level %* +call %configure% -top-level %* set err=%errorlevel% cd .. -if not %err% == 0 goto out - -echo + qtbase\bin\qmake %srcpath% -qtbase\bin\qmake %srcpath% -set err=%errorlevel% - -:out exit /b %err% |