diff options
| author | Rafael Roquetto <rafael.roquetto@kdab.com> | 2012-07-31 12:12:52 +0200 |
|---|---|---|
| committer | Thomas McGuire <thomas.mcguire@kdab.com> | 2012-11-27 13:14:20 +0100 |
| commit | 7619b2447dea3bb9f4cc205ed0bb4ff6da77c1f2 (patch) | |
| tree | 8f492ad0980c7a48303058abc30451bd59b4bb6a | |
| parent | 41ce65346ed01a22af786d92532024ed514805db (diff) | |
Fix compilation on Windows
Change-Id: Ie5e042bf412e28e8541bf953a4dff47363c30cce
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| -rw-r--r-- | configure.bat | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/configure.bat b/configure.bat index fe659816ff..707f5377ae 100644 --- a/configure.bat +++ b/configure.bat @@ -487,6 +487,10 @@ echo mobility_modules = %MOBILITY_MODULES% >> %PROJECT_CONFIG% echo contains(mobility_modules,versit): mobility_modules *= contacts >> %PROJECT_CONFIG%
echo contains(mobility_modules,connectivity): mobility_modules *= serviceframework >> %PROJECT_CONFIG%
+:: Some modules are disabled from compilation on QNX right now: +echo qnx: mobility_modules -= bearer location contacts publishsubscribe versit messaging systeminfo serviceframework gallery organizer feedback connectivity >> %PROJECT_CONFIG% + + echo.
echo Checking available Qt ...
call %QT_PATH%qmake -v >> %PROJECT_LOG% 2>&1
@@ -551,6 +555,12 @@ setlocal echo mingw32-make
set MAKE=mingw32-make
)
+ ) else if "%BUILDSYSTEM%" == "UNIX" ( + call mingw32-make -v >> %PROJECT_LOG% 2>&1 + if not errorlevel 1 ( + echo mingw32-make + set MAKE=mingw32-make + ) ) else (
echo Error: unknown target environment %BUILDSYSTEM%.
)
|