diff options
Diffstat (limited to 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 834065ee61..fc225ff098 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -21,9 +21,7 @@ CFLAGS_EXTRA = -fms-compatibility-version=19.00.23506 -Wno-microsoft-enum-v !else CXX = cl LINKER = link -! if "$(QMAKESPEC)" == "win32-msvc2005" -CFLAGS_EXTRA = /Zc:wchar_t- -! elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012" || "$(QMAKESPEC)" == "win32-msvc2013" +! if "$(QMAKESPEC)" == "win32-msvc2013" CFLAGS_EXTRA = /MP /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS $(CFLAGS_CRT) ! elseif "$(QMAKESPEC)" == "win32-msvc2015" || "$(QMAKESPEC)" == "win32-clang-msvc2015" CFLAGS_EXTRA = /MP /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS /Zc:strictStrings /w44456 /w44457 /w44458 /wd4577 $(CFLAGS_CRT) @@ -68,8 +66,7 @@ OBJS = project.obj main.obj ioutils.obj proitems.obj qmakevfs.obj \ option.obj winmakefile.obj projectgenerator.obj property.obj meta.obj \ makefiledeps.obj metamakefile.obj xmloutput.obj \ msvc_nmake.obj msvc_vcproj.obj msvc_vcxproj.obj \ - msvc_objectmodel.obj msbuild_objectmodel.obj registry.obj \ - cesdkhandler.obj + msvc_objectmodel.obj msbuild_objectmodel.obj registry.obj #qt code QTOBJS= \ |