diff options
author | AndersBroman <anders.broman@ericsson.com> | 2014-06-03 16:40:44 +0200 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-06-04 04:26:53 +0000 |
commit | 1f17d0c6bb040c1dd4b8d95bec9751bf6a14d7e8 (patch) | |
tree | 1654756f99da663253755d9b6b5714435f9dc6ba /config.nmake | |
parent | a3ebd0d8d95fa508fb0784413e1d10db90083c81 (diff) | |
download | wireshark-1f17d0c6bb040c1dd4b8d95bec9751bf6a14d7e8.tar.gz |
Use the -Ox compiler option.
Change-Id: I5d216d132485f6d2f8c63fa5a10b22e884e26b02
Reviewed-on: https://code.wireshark.org/review/1937
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'config.nmake')
-rw-r--r-- | config.nmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index 500dfe81ab..4843ea956f 100644 --- a/config.nmake +++ b/config.nmake @@ -994,6 +994,14 @@ APPVER=5.02 # This definition prevents the complaint about the redefinition of inline by WinPCap # in pcap-stdinc.h when compiling CPP files, e.g. the QT UI # +# -Ox http://msdn.microsoft.com/en-us/library/59a3b321.aspx +# Specifying the /Ox compiler option is the same as using the following options: +# /Ob (Inline Function Expansion), where the option parameter is 2 (/Ob2) +# /Og (Global Optimizations) +# /Oi (Generate Intrinsic Functions) +# /Ot (Favor Fast Code) +# /Oy (Frame-Pointer Omission) + ##Note: LOCAL_CFLAGS are flags used for *all* compilations ## STANDARD_CFLAGS (see below) are flags used just for *Wireshark* compilations !IF "$(MSVC_VARIANT)" == "MSVC2005" || \ @@ -1007,7 +1015,7 @@ APPVER=5.02 "$(MSVC_VARIANT)" == "MSVC2012EE" || \ "$(MSVC_VARIANT)" == "MSVC2013" || \ "$(MSVC_VARIANT)" == "MSVC2013EE" -LOCAL_CFLAGS=/Zi /W3 /MD /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \ +LOCAL_CFLAGS=/Zi /W3 /MD /Ox /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \ /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE -DPSAPI_VERSION=1 !IF "$(MSVC_VARIANT)" == "MSVC2012" || \ |