diff options
Diffstat (limited to 'qmake/Makefile.win32')
-rw-r--r-- | qmake/Makefile.win32 | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 4a1347c954..9dda6ca1e7 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -1,5 +1,3 @@ -!IF "$(QMAKESPEC)" == "win32-msvc" || "$(QMAKESPEC)" == "win32-msvc.net" || "$(QMAKESPEC)" == "win32-msvc2002" || "$(QMAKESPEC)" == "win32-msvc2003" || "$(QMAKESPEC)" == "win32-msvc2005" || "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012" || "$(QMAKESPEC)" == "win32-msvc2013" || "$(QMAKESPEC)" == "win32-icc" - !if "$(SOURCE_PATH)" == "" SOURCE_PATH = .. !endif @@ -10,25 +8,25 @@ BUILD_PATH = .. QMKSRC = $(SOURCE_PATH)\qmake # -# specific stuff for NMake and ICC +# per-compiler options # !if "$(QMAKESPEC)" == "win32-icc" -CXX = icl -LINKER = link -CFLAGS = /Zc:forScope +CXX = icl +LINKER = link +CFLAGS_EXTRA = /Zc:forScope !else -CXX = cl -LINKER = link -!endif - -# -# specific stuff for VS2005 -# -!if "$(QMAKESPEC)" == "win32-msvc2005" +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" -CFLAGS_EXTRA = /MP /D_CRT_SECURE_NO_WARNINGS $(CFLAGS_CRT) -!endif +! elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012" || "$(QMAKESPEC)" == "win32-msvc2013" +CFLAGS_EXTRA = /MP /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS $(CFLAGS_CRT) +! elseif "$(QMAKESPEC)" == "win32-msvc2015" +CFLAGS_EXTRA = /MP /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS /Zc:strictStrings /w44456 /w44457 /w44458 $(CFLAGS_CRT) +! else +! error Unsupported compiler for this Makefile +! endif +!endif # !win32-icc CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \ -W3 -nologo -O1 \ @@ -52,10 +50,6 @@ LIBS = ole32.lib advapi32.lib shell32.lib LINKQMAKE = $(LINKER) $(LFLAGS) -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = qmake.pdb qmake.ilk -!ELSE -!ERROR Unsupported compiler for this Makefile -!ENDIF - #qmake code OBJS = project.obj main.obj ioutils.obj proitems.obj qmakevfs.obj \ qmakeglobals.obj qmakeparser.obj qmakeevaluator.obj qmakebuiltins.obj \ @@ -64,7 +58,7 @@ OBJS = project.obj main.obj ioutils.obj proitems.obj qmakevfs.obj \ makefiledeps.obj metamakefile.obj xmloutput.obj \ msvc_nmake.obj msvc_vcproj.obj msvc_vcxproj.obj \ msvc_objectmodel.obj msbuild_objectmodel.obj registry.obj \ - gbuild.obj cesdkhandler.obj + cesdkhandler.obj #qt code QTOBJS= \ @@ -146,7 +140,9 @@ clean:: -del qmake.tds distclean:: clean - -del qmake + -del qmake.exe + -del $(BUILD_PATH)\bin\qmake.exe + -del Makefile .c.obj: $(CXX) $(CFLAGS) $< |