aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-10-17 17:50:00 +0000
committerGerald Combs <gerald@wireshark.org>2013-10-17 17:50:00 +0000
commite7202d159ac28d962b81d7ebdd422f94035a1d6e (patch)
treec4fdb5be71b5a29dd3a68250403e2f0abb7c8130 /Makefile.nmake
parentcbe8af0a8b75399f3fe909ee8b838eeedd6fae40 (diff)
If static analysis is enabled disable error checking when compiling the
Qt code. This should hopefully work around a builder issue. svn path=/trunk/; revision=52661
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 28b5e68e6d..b2cffa1da0 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -776,11 +776,18 @@ gtk:: help config.h svnversion.h doxygen
$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib
cd ../..
+# The Visual C++ static analyzer currently fails with error C2171
+# when compiling summary_dialog.cpp. If/when this ever gets fixed
+# we can remove the ENABLE_CODE_ANALYSIS check.
qt:: help config.h svnversion.h doxygen
!IFDEF QT5_BASE_DIR
cd ui/qt
$(QT5_BASE_DIR)\bin\qmake CONFIG+=release QtShark.pro
+!IFDEF ENABLE_CODE_ANALYSIS
+ -nmake
+!ELSE
nmake
+!ENDIF
cd ../..
!ENDIF