aboutsummaryrefslogtreecommitdiffstats
path: root/ui/win32
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-01-16 01:45:26 +0000
committerGuy Harris <guy@alum.mit.edu>2012-01-16 01:45:26 +0000
commit8b96d4930dfe5d33e24bdb2f5f8e41200bc6826a (patch)
tree6b1958227b9a595d01e4505dffed92dfd3c32498 /ui/win32
parent375399181c688b51cb8c0d0ea91d26f6bff07133 (diff)
Fix up for the move from the top-level directory to the ui directory.
svn path=/trunk/; revision=40534
Diffstat (limited to 'ui/win32')
-rw-r--r--ui/win32/Makefile.nmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/win32/Makefile.nmake b/ui/win32/Makefile.nmake
index 575171bbd6..cfa7ebc7bf 100644
--- a/ui/win32/Makefile.nmake
+++ b/ui/win32/Makefile.nmake
@@ -3,14 +3,14 @@
#
# $Id$
-include ..\config.nmake
-include ..\Makefile.nmake.inc
+include ..\..\config.nmake
+include ..\..\Makefile.nmake.inc
############### no need to modify below this line #########
CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
-D_NEED_VAR_IMPORT_ /Zm800 \
- /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
+ /I../.. /I../../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
/I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
/I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
/I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS)
@@ -25,7 +25,7 @@ WIRESHARK_WIN32_SRC = \
WIRESHARK_WIN32_OBJECTS = $(WIRESHARK_WIN32_SRC:.c=.obj)
-libui_win32.lib : ..\config.h $(WIRESHARK_WIN32_OBJECTS)
+libui_win32.lib : ..\..\config.h $(WIRESHARK_WIN32_OBJECTS)
link /lib /out:libui_win32.lib $(WIRESHARK_WIN32_OBJECTS) winmm.lib
clean:
@@ -36,5 +36,5 @@ distclean: clean
maintainer-clean: distclean
checkapi:
- $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk \
+ $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk \
$(WIRESHARK_WIN32_SRC)