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 /config.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 'config.nmake')
| -rw-r--r-- | config.nmake | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/config.nmake b/config.nmake index 2adbe761bb..7187644940 100644 --- a/config.nmake +++ b/config.nmake @@ -1686,11 +1686,6 @@ SMI_DIR=$(WIRESHARK_LIB_DIR)\libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws SMI_CONFIG=^#define HAVE_LIBSMI 1 SMI_CFLAGS=/I$(SMI_DIR)\include SMI_LIBS=$(SMI_DIR)\lib\libsmi-2.lib -!ELSE -SMI_DIR= -SMI_LIBS= -SMI_CFLAGS= -SMI_CONFIG= !ENDIF !IFDEF GEOIP_PKG @@ -1699,12 +1694,6 @@ GEOIP_CONFIG=^#define HAVE_GEOIP 1 GEOIP_V6_CONFIG=^#define HAVE_GEOIP_V6 1 GEOIP_CFLAGS=/I$(GEOIP_DIR)/include GEOIP_LIBS=$(GEOIP_DIR)\lib\libGeoIP-1.lib -!ELSE -GEOIP_DIR= -GEOIP_LIBS= -GEOIP_CFLAGS= -GEOIP_CONFIG= -GEOIP_V6_CONFIG= !ENDIF !IFDEF WINSPARKLE_PKG @@ -1712,11 +1701,6 @@ WINSPARKLE_DIR=$(WIRESHARK_LIB_DIR)\WinSparkle-$(WINSPARKLE_PKG) WINSPARKLE_CONFIG=^#define HAVE_SOFTWARE_UPDATE 1 WINSPARKLE_CFLAGS=/I$(WINSPARKLE_DIR) WINSPARKLE_LIBS=$(WINSPARKLE_DIR)\WinSparkle.lib -!ELSE -WINSPARKLE_DIR= -WINSPARKLE_CONFIG= -WINSPARKLE_CFLAGS= -WINSPARKLE_LIBS= !ENDIF !IFDEF ENABLE_LIBWIRESHARK |