aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-06-11 07:49:36 +0000
committerGuy Harris <guy@alum.mit.edu>2000-06-11 07:49:36 +0000
commit069f5695ed7bf242e3f9274930f1a332f4d6a7a0 (patch)
tree64df2eb62709d16bb6d8330da3ac89d44fcf7f9f
parent9907f9b9ff8b3a493acf8bc5e982bee36f0608e5 (diff)
Search for the GDK library in $(GTK_DIR)\gdk rather than in
$(GTK_DIR)\gdk\win32 - the latest GTK+ packages for Win32 don't put it in a "win32" subdirectory. svn path=/trunk/; revision=2055
-rw-r--r--Makefile.nmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 68db64e83b..f30b91ad4b 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: nmake -f makefile.nmake
#
-# $Id: Makefile.nmake,v 1.41 2000/06/07 22:57:44 gram Exp $
+# $Id: Makefile.nmake,v 1.42 2000/06/11 07:49:36 guy Exp $
include config.nmake
@@ -193,7 +193,7 @@ EXTRA_OBJECTS = \
ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib wsock32.lib user32.lib \
$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \
- $(GTK_DIR)\gdk\win32\gdk-$(GTK_VERSION).lib \
+ $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
$(GLIB_DIR)\gmodule-$(GLIB_VERSION).lib \
$(PCAP_DIR)\lib\libpcap.lib