diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-11-05 21:49:57 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-11-05 21:49:57 +0000 |
| commit | 1631f12389cca5bc1feb1a0ee4913176342be34e (patch) | |
| tree | e9b31716508e3ec9b88096bdcb9f007595bde0bc /config.nmake | |
| parent | 7c33631d692163765a69bc27501c624060071a94 (diff) | |
From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9375 :
Avoid a 'GetVersionEx deprecated' warning when compiling with MSVC2013
svn path=/trunk/; revision=53095
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index 4670cc71f3..8b33ebe416 100644 --- a/config.nmake +++ b/config.nmake @@ -923,6 +923,11 @@ APPVER=5.02 # add Psapi.lib to the TARGETLIBS macro and compile the program with -DPSAPI_VERSION=1. # To use run-time dynamic linking, load Psapi.dll. # http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx +# -DBUILD_WINDOWS Starting from VS2103, GetVersionEx is deprecated and we are recommended to use +# VerifyVersionInfo instead +# http://msdn.microsoft.com/en-us/library/windows/desktop/ms724429(v=vs.85).aspx +# http://msdn.microsoft.com/en-us/library/windows/desktop/ms725491(v=vs.85).aspx +# To continue to use GetVersionEx, we can define BUILD_WINDOWS # ##Note: LOCAL_CFLAGS are flags used for *all* compilations ## STANDARD_CFLAGS (see below) are flags used just for *Wireshark* compilations @@ -940,6 +945,11 @@ APPVER=5.02 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 -DPSAPI_VERSION=1 +!IF "$(MSVC_VARIANT)" == "MSVC2013" || \ + "$(MSVC_VARIANT)" == "MSVC2013EE" +LOCAL_CFLAGS=$(LOCAL_CFLAGS) /DBUILD_WINDOWS +!ENDIF + !IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64" LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1 !ENDIF |