Move th /MP flag setting to LOCAL_CFLAGS set in configure.nmake

for MSVC variant 2008 only. As suggested by Bill Meier.

svn path=/trunk/; revision=29114

10 files changed, 25 insertions, 9 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 29673b01e2..ccfc26ad0a 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -45,7 +45,7 @@ GENERATED_CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
 	$(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) \
 	$(LUA_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS) \
 	-D_U_="" -D_NEED_VAR_IMPORT_
-CFLAGS=-WX /MP $(GENERATED_CFLAGS)
+CFLAGS=-WX $(GENERATED_CFLAGS)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
diff --git a/config.nmake b/config.nmake
index 56c8175a4c..772bfa720a 100644
--- a/config.nmake
+++ b/config.nmake
@@ -742,6 +742,22 @@ LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 !ERROR MSVC_VARIANT unknown
 !ENDIF
 
+# http://msdn.microsoft.com/en-us/library/bb385193.aspx
+# /MP (Build with Multiple Processes)
+# /MP[processMax]
+# If you omit the processMax argument, the compiler retrieves the number of effective processors 
+# on your computer from the operating system, and creates a process for each processor.
+#
+# The following compiler options and language features that are incompatible with the /MP option:
+# #import preprocessor directive 
+# /E, /EP 
+# /Gm 
+# /showIncludes 
+# /Yc 
+
+!IF "$(MSVC_VARIANT)" == "MSVC2008"
+LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
+!ENDIF
 # Linker flags:
 # /DEBUG  generate debug info
 # /PROFILE generate map file(s) for profiling
diff --git a/epan/crc/Makefile.nmake b/epan/crc/Makefile.nmake
index c55142c7e1..b4e37e2e7e 100644
--- a/epan/crc/Makefile.nmake
+++ b/epan/crc/Makefile.nmake
@@ -8,7 +8,7 @@ include Makefile.common
 
 ############### no need to modify below this line #########
 
-CFLAGS=-WX /MP -DHAVE_CONFIG_H $(GLIB_CFLAGS) -D_U_="" /I../.. $(LOCAL_CFLAGS)
+CFLAGS=-WX -DHAVE_CONFIG_H $(GLIB_CFLAGS) -D_U_="" /I../.. $(LOCAL_CFLAGS)
 
 .c.obj::
 	$(CC) $(CFLAGS)  -Fd.\ -c $<
diff --git a/epan/crypt/Makefile.nmake b/epan/crypt/Makefile.nmake
index 215e91a7b9..b05773a2cf 100644
--- a/epan/crypt/Makefile.nmake
+++ b/epan/crypt/Makefile.nmake
@@ -8,7 +8,7 @@ include Makefile.common
 
 ############### no need to modify below this line #########
 
-CFLAGS=-WX /MP -DHAVE_CONFIG_H $(GLIB_CFLAGS) -D_U_="" /I../.. $(LOCAL_CFLAGS)
+CFLAGS=-WX -DHAVE_CONFIG_H $(GLIB_CFLAGS) -D_U_="" /I../.. $(LOCAL_CFLAGS)
 
 .c.obj::
 	$(CC) $(CFLAGS)  -Fd.\ -c $<
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 53714bfca9..d79e33e3d7 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -13,7 +13,7 @@ LEMON=..\..\tools\lemon
 # We GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
 GENERATED_CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I..\.. /I$(LEMON) \
 	$(GLIB_CFLAGS) $(PCRE_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
-CFLAGS=-WX /MP $(GENERATED_CFLAGS)
+CFLAGS=-WX $(GENERATED_CFLAGS)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index 6728b923d2..17475cbd90 100644
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -9,7 +9,7 @@ include Makefile.common
 
 ############### no need to modify below this line #########
 
-CFLAGS=-WX /MP -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \
+CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \
 	$(PCRE_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL 
diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake
index 155f1dbc08..64391ee9cc 100644
--- a/epan/wslua/Makefile.nmake
+++ b/epan/wslua/Makefile.nmake
@@ -6,7 +6,7 @@ include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=-WX /MP -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) $(LUA_CFLAGS) \
+CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) $(LUA_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL 
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 07b6b245f1..3ff84af439 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -7,7 +7,7 @@ include ..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=-WX /MP -DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
+CFLAGS=-WX -DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
 	/I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
 	/I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
 	/I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index e771e3aa1c..456d7a9ed5 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -12,7 +12,7 @@ include Makefile.common
 GENERATED_CFLAGS=-DYYMALLOC=malloc -DYYFREE=free -DHAVE_CONFIG_H /I. /I.. \
 	$(GLIB_CFLAGS) $(ZLIB_CFLAGS) /I$(PCAP_DIR)/include \
 	-D_U_="" $(LOCAL_CFLAGS)
-CFLAGS=-WX /MP $(GENERATED_CFLAGS)
+CFLAGS=-WX $(GENERATED_CFLAGS)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake
index 6d92e0c477..d12fe41863 100644
--- a/wsutil/Makefile.nmake
+++ b/wsutil/Makefile.nmake
@@ -11,7 +11,7 @@ include ..\Makefile.nmake.inc
 
 include Makefile.common
 
-CFLAGS=-WX /MP -DHAVE_CONFIG_H /I. /I.. $(GLIB_CFLAGS) \
+CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL