diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-10-13 21:01:11 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-10-13 19:33:07 +0000 |
| commit | 1f481258da05feb9ff165f586292330427c841a9 (patch) | |
| tree | 0b5e5bc0cf1677ebf3da2f77c6b1ac58287a1917 /Makefile.nmake | |
| parent | 05a6615965121056aa0e8e431a4a541342776d83 (diff) | |
Upgrade Win64 GTK2 package to 2.24.23-3.39
Change-Id: I0f5f27aa2fc13f38af73a42e1c6e4a36636d2fc7
Reviewed-on: https://code.wireshark.org/review/4656
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 8f25663a83..f4782db47d 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -75,7 +75,6 @@ reordercap_OBJECTS = $(reordercap_SOURCES:.c=.obj) wireshark_gtk_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib shell32.lib comctl32.lib ole32.lib psapi.lib \ - $(GTHREAD_LIBS) \ $(HHC_LIBS) \ wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ @@ -96,7 +95,6 @@ wireshark_gtk_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib psapi.lib \ $(GLIB_LIBS) \ - $(GTHREAD_LIBS) \ wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK @@ -115,7 +113,6 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ tfshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib psapi.lib \ $(GLIB_LIBS) \ - $(GTHREAD_LIBS) \ wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK @@ -181,8 +178,7 @@ dumpcap_LIBS= \ wsock32.lib user32.lib \ caputils\libcaputils.lib \ wsutil\libwsutil.lib \ - $(GLIB_LIBS) \ - $(GTHREAD_LIBS) + $(GLIB_LIBS) dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib psapi.lib \ @@ -1370,7 +1366,6 @@ install-all: install-generated-files xcopy $(GTK_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d xcopy $(GTK_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR) /d xcopy $(GTK_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\libgthread-2.0-0.dll $(INSTALL_DIR) /d !IF "$(GTK_PKG)" != "2.24.14-1.1" xcopy $(GTK_DIR)\bin\$(INTL_DLL) $(INSTALL_DIR) /d !ENDIF |