diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-18 16:33:42 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-11 03:38:40 +0100 |
| commit | e00d8ad86b8961e514fc91534127f5aa62c3b22f (patch) | |
| tree | b9a93c375c3c3ace9b22b21a381a9bb6f16b13c1 /qmake | |
| parent | 56c153c271ebb39489bc68c43e006818e2c8d306 (diff) | |
Prettify the per-compiler setting of Makefile.win32
This just reindents and makes it easier to read what's going on.
Change-Id: Id0afcdfb8f468b4553bba8c5a572a1d0115b0886
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32 | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index bb240e1862..a049b28b5f 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -1,5 +1,3 @@ -!IF "$(QMAKESPEC)" == "win32-msvc2005" || "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012" || "$(QMAKESPEC)" == "win32-msvc2013" || "$(QMAKESPEC)" == "win32-msvc2015" || "$(QMAKESPEC)" == "win32-icc" - !if "$(SOURCE_PATH)" == "" SOURCE_PATH = .. !endif @@ -10,27 +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" +! elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012" || "$(QMAKESPEC)" == "win32-msvc2013" CFLAGS_EXTRA = /MP /D_CRT_SECURE_NO_WARNINGS $(CFLAGS_CRT) -!elseif "$(QMAKESPEC)" == "win32-msvc2015" +! elseif "$(QMAKESPEC)" == "win32-msvc2015" CFLAGS_EXTRA = /MP /D_CRT_SECURE_NO_WARNINGS /Zc:strictStrings /w44456 /w44457 /w44458 $(CFLAGS_CRT) -!endif +! else +! error Unsupported compiler for this Makefile +! endif +!endif # !win32-icc CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \ -W3 -nologo -O1 \ @@ -54,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 \ |