aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2004-05-14 16:23:38 +0000
committerUlf Lamping <ulf.lamping@web.de>2004-05-14 16:23:38 +0000
commit3508e885639802a10fb8b9a09a02b68652e912be (patch)
treed66238298c606f88d8024a19c986c549fe008229 /Makefile.nmake
parentd68c9fef0f7a7456a2465db855690cc783d07d1e (diff)
GTK Wimp has it's own setting: GTK_WIMP_DIR,
the setup target should use it accordingly svn path=/trunk/; revision=10894
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 221c6995ef..bf1d94a217 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id: Makefile.nmake,v 1.418 2004/05/13 20:54:39 obiot Exp $
+# $Id: Makefile.nmake,v 1.419 2004/05/14 16:23:38 ulfl Exp $
include config.nmake
include <win32.mak>
@@ -435,6 +435,8 @@ setup: verify_apps
gtk2 gtk2/atk-1.4.0.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
gtk2 gtk2/atk-dev-1.4.0.zip
+!ENDIF
+!IFDEF GTK_WIMP_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
gtk-wimp gtk2/gtk-wimp-0.5.4-bin.zip
!ENDIF