diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-07-24 15:54:55 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-07-24 15:54:55 +0000 |
| commit | 61e0e4d88ce29a1f21f5a7a11e0d7577f0c0c089 (patch) | |
| tree | 0f6fe564d6077c5c91fa4b66830e20af970432e0 /Makefile.nmake | |
| parent | 479580361495b846eba45ff577a696f61c377875 (diff) | |
| download | wireshark-61e0e4d88ce29a1f21f5a7a11e0d7577f0c0c089.tar.gz wireshark-61e0e4d88ce29a1f21f5a7a11e0d7577f0c0c089.tar.bz2 wireshark-61e0e4d88ce29a1f21f5a7a11e0d7577f0c0c089.zip | |
Make it possible to use GetProcessMemoryInfo on Windows.
svn path=/trunk/; revision=50865
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 8de24e3864..87607037ec 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -70,8 +70,12 @@ dftest_OBJECTS = $(dftest_SOURCES:.c=.obj) dumpcap_OBJECTS = $(dumpcap_SOURCES:.c=.obj) randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj) +# +# psapi.lib see http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx +# + wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib shell32.lib comctl32.lib ole32.lib \ + wsock32.lib user32.lib shell32.lib comctl32.lib ole32.lib psapi.lib \ $(GTHREAD_LIBS) \ $(HHC_LIBS) \ wsutil\libwsutil.lib \ |