diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-12-01 10:05:16 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-12-01 10:05:16 +0000 |
| commit | 244000000d1249cb2243df2229aa1ca0c0dceabb (patch) | |
| tree | 33e502c033664c2c8128a807f29dece1005090f3 /config.nmake | |
| parent | 6cd4ad721f94b5b2c4e5136bad179eb83585f150 (diff) | |
- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying
pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.
svn path=/trunk/; revision=53690
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config.nmake b/config.nmake index 2d0bd917cf..5df2584816 100644 --- a/config.nmake +++ b/config.nmake @@ -339,7 +339,7 @@ QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010 # PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack # This macro is used by the nsis installer script, by the u3/portable apps and by the setup target. -PCAP_VERSION=4_1_3 +WINPCAP_VERSION=4_1_3 WPD_VERSION=4_1_2 # @@ -584,7 +584,7 @@ QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010 # PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack # This macro is used by the nsis installer script, by the u3/portable apps and by the setup target. -PCAP_VERSION=4_1_3 +WINPCAP_VERSION=4_1_3 WPD_VERSION=4_1_2 # @@ -995,7 +995,7 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX- !ENDIF #STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc) -STANDARD_CFLAGS=/DPCAP_VERSION=$(PCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS) +STANDARD_CFLAGS=/DWINPCAP_VERSION=$(WINPCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS) # Optional: Define WIRESHARK_GENERATE_BSC_FILE to generate .sbr files for input to bscmake !IFDEF WIRESHARK_GENERATE_BSC_FILE |