diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-01-06 23:28:58 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-01-06 23:28:58 +0000 |
| commit | 3bc1fc38026b7438361c23e3fe0d8bb16a4b1583 (patch) | |
| tree | d8e63f631f4eb3535026e250352b0254e49be4f1 /Makefile.nmake | |
| parent | b0beaec6a19b496bed93a040c9fcddc65abc4806 (diff) | |
On Windows, convert all of our command-line arguments from UTF-16 to
UTF-8 where we don't already do so. In Wireshark use g_utf16_to_utf8
instead of utf_16to8. This should fix bug 5520.
svn path=/trunk/; revision=35411
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index d945a334a4..efb9a54cc8 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -92,7 +92,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ !ENDIF tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ + wsock32.lib user32.lib shell32.lib \ $(GLIB_LIBS) \ wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ @@ -112,7 +112,7 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ !ENDIF rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ + wsock32.lib user32.lib shell32.lib \ $(GLIB_LIBS) \ wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ @@ -143,17 +143,17 @@ editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(GLIB_LIBS) mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ + wsock32.lib user32.lib shell32.lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) text2pcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ + wsock32.lib user32.lib shell32.lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) dumpcap_LIBS= \ - wsock32.lib user32.lib \ + wsock32.lib user32.lib shell32.lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) \ $(GTHREAD_LIBS) @@ -177,7 +177,7 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ !ENDIF randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - user32.lib \ + user32.lib shell32.lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) |