osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Anders Broman 2009-07-16 08:27:18 +00:00
parent 6ade5c0615
commit 67d6f5976e
10 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.nmake
View File

@ -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

16
config.nmake
View File

@ -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

2
epan/crc/Makefile.nmake
View File

@ -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 $<

2
epan/crypt/Makefile.nmake
View File

@ -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 $<

2
epan/dfilter/Makefile.nmake
View File

@ -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

2
epan/ftypes/Makefile.nmake
View File

@ -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

2
epan/wslua/Makefile.nmake
View File

@ -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

2
gtk/Makefile.nmake
View File

@ -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) \

2
wiretap/Makefile.nmake
View File

@ -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

2
wsutil/Makefile.nmake
View File

@ -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