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 /Makefile.nmake | |
parent | 6cd4ad721f94b5b2c4e5136bad179eb83585f150 (diff) | |
download | wireshark-244000000d1249cb2243df2229aa1ca0c0dceabb.tar.gz |
- 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 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 73a297ee92..64119998ff 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -913,7 +913,7 @@ install_qt: process_libs: @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)" @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . WinPcap_$(PCAP_VERSION).exe + . WinPcap_$(WINPCAP_VERSION).exe !IFNDEF QT5_BASE_DIR !MESSAGE Can't find Qt. This will become a problem at some point. !ENDIF |