diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2015-01-07 10:25:35 +0200 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-07 14:37:35 +0000 |
| commit | 734e4083c9bd18a15451691ee5967f14a4c4019d (patch) | |
| tree | e87068b30efc6d2edb4b583d5ef7bcec12587a00 /Makefile.nmake | |
| parent | ed9a9be5df40de6aa1f2eb8da1fff08c23680baf (diff) | |
MSVC: Fix opting out of libraries
When *_DIR variables are defined (even if empty), nmake tries
to build them and fails.
Don't set them at all if not configured to.
Change-Id: I3825c16f26e45a1a3fc489633084a074838f8c34
Reviewed-on: https://code.wireshark.org/review/6365
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index e4641ea71c..7aeccde513 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -970,10 +970,13 @@ install_qt: # (The choice is determined by the value of the macro WIN_SETUP_OPT). process_libs: @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)" + +!IFDEF PCAP_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ . \ WinPcap_$(WINPCAP_VERSION).exe \ "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" +!ENDIF !IFNDEF QT5_BASE_DIR !MESSAGE Can't find Qt. This will become a problem at some point. |