osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

A bit of Windows makefiles rework and cleanup: 

- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35747 f5534014-38df-0310-8fa8-9805f1628bb7
This commit is contained in:
wmeier 2011-02-02 01:19:53 +00:00
parent 910a4a2ffb
commit 1bf7175453
35 changed files with 176 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.nmake
View File

@ -39,14 +39,15 @@ CHECK_TAG=
LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS)
# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
GENERATED_CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
GENERATED_CFLAGS=\
$(STANDARD_CFLAGS) \
-D_NEED_VAR_IMPORT_ \
/I. /Iwiretap $(GLIB_CFLAGS) \
$(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
$(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) \
$(PYTHON_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS) \
-D_U_="" -D_NEED_VAR_IMPORT_
CFLAGS=-WX $(GENERATED_CFLAGS)
$(PYTHON_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
@ -439,7 +440,7 @@ text2pcap-scanner.obj : text2pcap-scanner.c
text2pcap.obj mergecap.obj capinfos.obj editcap.obj version_info.obj: svnversion.h
clean-local: clean-deps
clean-local:
rm -f $(wireshark_OBJECTS) $(tshark_OBJECTS) $(dumpcap_OBJECTS) $(rawshark_OBJECTS) \
$(EXECUTABLES) *.pdb *.exe.manifest \
capinfos.obj editcap.obj mergecap.obj text2pcap.obj \
@ -451,6 +452,7 @@ clean-local: clean-deps
$(RESOURCES) libwireshark.dll wiretap-$(WTAP_VERSION).dll \
libwsutil.dll \
wireshark.bsc
rm -rf $(INSTALL_DIR)
clean: clean-local
cd asn1
@ -1081,12 +1083,6 @@ install-all: install-generated-files
xcopy "$(SMI_DIR)\mibs\*" $(INSTALL_DIR)\snmp\mibs /d
!ENDIF
clean-deps:
rm -rf $(INSTALL_DIR)
cd plugins
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps
cd ..
checkapi_local:
$(PERL) tools/checkAPIs.pl \
$(wireshark_SOURCES) \

9
codecs/Makefile.nmake
View File

@ -7,7 +7,8 @@ include ..\config.nmake
############### no need to modify below this line #########
CFLAGS=-WX -DHAVE_CONFIG_H $(GLIB_CFLAGS) -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
$(GLIB_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
@ -17,8 +18,8 @@ CODEC_OBJECTS= \
G711adecode.obj
codecs.lib : $(CODEC_OBJECTS)
link /lib /out:codecs.lib $(CODEC_OBJECTS)
codecs.lib : $(CODEC_OBJECTS)
link /lib /out:codecs.lib $(CODEC_OBJECTS)
G711adecode.obj: G711a\G711adecode.c G711a\G711adecode.h G711a\G711atable.h
@ -34,7 +35,7 @@ distclean: clean
maintainer-clean: distclean
checkapi:
checkapi:
$(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \
G711a/G711adecode.c \
G711u/G711udecode.c

58
config.nmake
View File

@ -758,22 +758,47 @@ MANIFEST_INFO_REQUIRED=1
!ENDIF
# Compiler flags:
# /W3 warning level 3 (0 less - 4 most, 1 default)
# /Zi create .pdb file for debugging
# /MD use "Multithreading Debug" libraries
# /D_CRT_SECURE_NO_DEPRECATE Don't warn for "insecure" calls, see MSDN "Security Enhancements in the CRT"
# /W3 Warning level 3 (0 less - 4 most, 1 default)
# /Zi Create .pdb file for debugging
# /MD Use "multithread- and DLL-specific version" of run-time libraries
# msvc documentation states that /MD causes _MT and _DLL to be defined
# See: http://msdn.microsoft.com/en-us/library/2kzt1wy3%28v=VS.90%29.aspx
# /D_CRT_SECURE_NO_DEPRECATE Don't warn for "insecure" calls,
# see MSDN "Security Enhancements in the CRT"
# /D_CRT_NONSTDC_NO_DEPRECATE Don't warn for "Deprecated CRT Functions" as MSDN calls this
# /D_BIND_TO_CURRENT_CRT_VERSION=1 Make sure our CRT and manifest versions match (http://msdn.microsoft.com/en-us/library/cc664727.aspx)
# /D_BIND_TO_CURRENT_CRT_VERSION=1 Make sure our CRT and manifest versions match
# (http://msdn.microsoft.com/en-us/library/cc664727.aspx)
# /DWIN32_LEAN_AND_MEAN Don't include unnecessary Windows include files (see windows.h)
# /MANIFEST:no Don't create a SxS manifest. Makes sure our plugins don't load a second copy of the CRT.
# /MANIFEST:no Don't create a SxS manifest. Makes sure our plugins don't load
# a second copy of the CRT.
#
!IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11"
##Note: LOCAL_CFLAGS is used used for *all* compilations
!IF "$(MSVC_VARIANT)" == "MSVC6" || \
"$(MSVC_VARIANT)" == "MSVC2002" || \
"$(MSVC_VARIANT)" == "DOTNET10" || \
"$(MSVC_VARIANT)" == "MSVC2003" || \
"$(MSVC_VARIANT)" == "DOTNET11"
LOCAL_CFLAGS=/Zi /W3 /MD /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" || "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE"
LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || \
"$(MSVC_VARIANT)" == "MSVC2005EE" || \
"$(MSVC_VARIANT)" == "DOTNET20" || \
"$(MSVC_VARIANT)" == "MSVC2008" || \
"$(MSVC_VARIANT)" == "MSVC2008EE" || \
"$(MSVC_VARIANT)" == "MSVC2010" || \
"$(MSVC_VARIANT)" == "MSVC2010EE"
LOCAL_CFLAGS=/Zi /W3 /MD /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \
/D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64"
LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1
!ENDIF
# Additional compiler warnings to be treated as "Level 3"
# when compiling Wireshark sources. (Selected from "level 4" warnings).
## 4295: array is too small to include a terminating null character
WARNINGS_CFLAGS=/w34295
!ELSE
!ERROR MSVC_VARIANT unknown
!ENDIF
@ -791,17 +816,28 @@ LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1
# * /showIncludes
# * /Yc
#
!IF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" || "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE"
!IF "$(MSVC_VARIANT)" == "MSVC2008" || \
"$(MSVC_VARIANT)" == "MSVC2008EE" || \
"$(MSVC_VARIANT)" == "MSVC2010" || \
"$(MSVC_VARIANT)" == "MSVC2010EE"
LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
!ENDIF
# Optional: Static analysis. Only supported in the full-frontal MSVC editions.
# http://msdn.microsoft.com/en-us/library/ms182025.aspx
#!IF "$(MSVC_VARIANT)" == "MSVC2010" && "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
#!IF "$(MSVC_VARIANT)" == "MSVC2010" && "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
#LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze
#!ENDIF
#STANDARD_CFLAGS is used only for Wireshark source compiles
STANDARD_CFLAGS=-DHAVE_CONFIG_H -D_U_="" $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
WARNINGS_ARE_ERRORS=-WX
## XXX: _MT and _DLL are defined when /MD is used so CVARSDLL is apparently unneeded
##CVARSDLL=-D_MT -D_DLL
# Linker flags:
# /DEBUG generate debug info
# /PROFILE generate map file(s) for profiling

9
epan/Makefile.nmake
View File

@ -12,13 +12,14 @@ include Makefile.common
LINK= link
# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
GENERATED_CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \
GENERATED_CFLAGS=\
$(STANDARD_CFLAGS) \
/I. /I.. /I../wiretap $(GLIB_CFLAGS) \
$(ZLIB_CFLAGS) $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) \
$(LUA_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \
$(SMI_CFLAGS) $(GEOIP_CFLAGS) -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=-WX $(GENERATED_CFLAGS)
$(SMI_CFLAGS) $(GEOIP_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
!IFDEF LUA_DIR
WSLUA_LIB=wslua\wslua.lib

7
epan/crc/Makefile.nmake
View File

@ -8,15 +8,16 @@ include Makefile.common
############### no need to modify below this line #########
CFLAGS=-WX -DHAVE_CONFIG_H $(GLIB_CFLAGS) -D_U_="" /I../.. $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
CRC_OBJECTS = $(CRC_SRC:.c=.obj)
crc.lib: $(CRC_OBJECTS)
link /lib /out:crc.lib $(CRC_OBJECTS)
crc.lib: $(CRC_OBJECTS)
link /lib /out:crc.lib $(CRC_OBJECTS)
clean:
rm -f $(CRC_OBJECTS) crc.lib *.pdb

7
epan/crypt/Makefile.nmake
View File

@ -8,15 +8,16 @@ include Makefile.common
############### no need to modify below this line #########
CFLAGS=-WX -DHAVE_CONFIG_H $(GLIB_CFLAGS) -D_U_="" /I../.. $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
AIRPDCAP_OBJECTS = $(LIBAIRPDCAP_SRC:.c=.obj)
airpdcap.lib: $(AIRPDCAP_OBJECTS)
link /lib /out:airpdcap.lib $(AIRPDCAP_OBJECTS)
airpdcap.lib: $(AIRPDCAP_OBJECTS)
link /lib /out:airpdcap.lib $(AIRPDCAP_OBJECTS)
clean:
rm -f $(AIRPDCAP_OBJECTS) airpdcap.lib *.pdb

10
epan/dfilter/Makefile.nmake
View File

@ -11,11 +11,13 @@ include Makefile.common
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 $(GENERATED_CFLAGS)
GENERATED_CFLAGS=\
$(STANDARD_CFLAGS) \
/I. /I.. /I..\.. $(GLIB_CFLAGS) \
/I$(LEMON) \
$(PCRE_CFLAGS) /I$(PCAP_DIR)\include
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<

14
epan/dissectors/Makefile.nmake
View File

@ -11,13 +11,12 @@ include Custom.nmake
include Makefile.common
CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \
CFLAGS= $(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I. /I.. /I../.. $(GLIB_CFLAGS) \
$(ZLIB_CFLAGS) \
$(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(NETTLE_CFLAGS) \
$(KFW_CFLAGS) $(AIRPCAP_CFLAGS) $(GEOIP_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
@ -32,7 +31,12 @@ dissectors.lib: register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../co
@echo Linking dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
!IF "$(MSVC_VARIANT)" != "MSVC2005EE" && "$(MSVC_VARIANT)" != "MSVC2005" && "$(MSVC_VARIANT)" != "MSVC2008EE" && "$(MSVC_VARIANT)" != "MSVC2008"
!IF "$(MSVC_VARIANT)" != "MSVC2005" && \
"$(MSVC_VARIANT)" != "MSVC2005EE" && \
"$(MSVC_VARIANT)" != "MSVC2008" && \
"$(MSVC_VARIANT)" != "MSVC2008EE" && \
"$(MSVC_VARIANT)" != "MSVC2010" && \
"$(MSVC_VARIANT)" != "MSVC2010EE"
# Disable debug for large dissectors
packet-rrc.obj : packet-rrc.c
$(CC) $(CVARSDLL) $(CFLAGS) /Zd /Fd.\ -c $?

7
epan/ftypes/Makefile.nmake
View File

@ -9,10 +9,9 @@ include Makefile.common
############### no need to modify below this line #########
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
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I. /I.. /I../.. $(GLIB_CFLAGS) \
$(PCRE_CFLAGS) /I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<

8
epan/wslua/Makefile.nmake
View File

@ -6,10 +6,10 @@ include ..\..\config.nmake
############### no need to modify below this line #########
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
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I. /I.. /I../.. $(GLIB_CFLAGS) \
$(LUA_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<

7
epan/wspython/Makefile.nmake
View File

@ -7,10 +7,9 @@ include Makefile.common
############### no need to modify below this line #########
CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) $(PYTHON_CFLAGS) \
-D_U_="" $(LOCAL_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I. /I.. /I../.. $(GLIB_CFLAGS) \
$(PYTHON_CFLAGS)
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<

10
gtk/Makefile.nmake
View File

@ -9,17 +9,17 @@ include ..\Makefile.nmake.inc
############### no need to modify below this line #########
# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
GENERATED_CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
GENERATED_CFLAGS=\
$(STANDARD_CFLAGS) \
-D_NEED_VAR_IMPORT_ /Zm800 \
/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) \
/Zm800 -D_U_="" -D_NEED_VAR_IMPORT_ $(LOCAL_CFLAGS) \
$(PORTAUDIO_CFLAGS) \
$(HHC_CFLAGS)
CFLAGS=-WX $(GENERATED_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<

2
plugins/Makefile.nmake
View File

@ -74,8 +74,6 @@ install-plugins:
if exist Custom.nmake $(MAKE) /$(MAKEFLAGS) -f Custom.nmake install-plugins
!ENDIF
clean-deps:
####
_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory

5
plugins/asn1/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/docsis/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/easy_codec/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
CPPFLAGS = $(CFLAGS) -TP

5
plugins/ethercat/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/giop/Makefile.nmake
View File

@ -6,8 +6,9 @@ include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
LDFLAGS = $(PLUGIN_LDFLAGS)

5
plugins/gryphon/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/interlink/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/irda/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/m2m/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../wimax $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. /I../wimax $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

9
plugins/mate/Makefile.nmake
View File

@ -14,9 +14,12 @@ include Makefile.common
LEMON=..\..\tools\lemon
# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
GENERATED_CFLAGS=/DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) /I$(LEMON)\
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=/WX $(GENERATED_CFLAGS)
GENERATED_CFLAGS=\
$(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) /I$(LEMON) \
/I$(PCAP_DIR)\include
CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/opcua/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/profinet/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/sercosiii/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/stats_tree/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fdstats_tree.pdb -c $<

5
plugins/tpg/Makefile.nmake
View File

@ -9,8 +9,9 @@ include <win32.mak>
LEMON=..\..\tools\lemon
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) /I$(LEMON)\
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) /I$(LEMON) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fdmate.pdb -c $<

5
plugins/unistim/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

5
plugins/wimax/Makefile.nmake
View File

@ -9,8 +9,9 @@ include moduleinfo.nmake
include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

10
plugins/wimaxasncp/Makefile.nmake
View File

@ -11,12 +11,12 @@ include ..\..\Makefile.nmake.inc
include Makefile.common
# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
GENERATED_CFLAGS=/DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=/WX $(GENERATED_CFLAGS)
GENERATED_CFLAGS=\
$(STANDARD_CFLAGS) \
/I../.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

2
tools/lemon/Makefile.nmake
View File

@ -5,7 +5,7 @@
include ..\..\config.nmake
CFLAGS=-WX -D_U_="" $(LOCAL_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) -D_U_="" $(LOCAL_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

9
win32/Makefile.nmake
View File

@ -8,13 +8,12 @@ include ..\Makefile.nmake.inc
############### no need to modify below this line #########
CFLAGS=-WX -DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
-D_NEED_VAR_IMPORT_ /Zm800 \
/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) \
/Zm800 -D_U_="" -D_NEED_VAR_IMPORT_ $(LOCAL_CFLAGS) \
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
/I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS)
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<

11
wiretap/Makefile.nmake
View File

@ -9,12 +9,13 @@ include ..\Makefile.nmake.inc
include Makefile.common
# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
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 $(GENERATED_CFLAGS)
GENERATED_CFLAGS=\
$(STANDARD_CFLAGS) \
-DYYMALLOC=malloc -DYYFREE=free \
/I. /I.. $(GLIB_CFLAGS) \
$(ZLIB_CFLAGS) /I$(PCAP_DIR)/include
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<

7
wsutil/Makefile.nmake
View File

@ -11,10 +11,9 @@ include ..\Makefile.nmake.inc
include Makefile.common
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
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
/I. /I.. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<