diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-03-20 00:30:47 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-03-20 00:30:47 +0000 |
| commit | 109657ae57ae5183f3679251050c9999b78fba5a (patch) | |
| tree | 95ab454a96c8571daf8a875d30baec7b49ae0854 /packaging/nsis | |
| parent | d4112bee74caeef3accf29627a52fa1125d8f405 (diff) | |
Use libgmodule-2.0-0.dll 2.14.5 for the GTK+1 version of Wireshark.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24703 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index d0c8310e2d..2cd700e56c 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -156,6 +156,7 @@ $(DEST)-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nm /DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \ !ENDIF /DGLIB_DIR=$(GLIB_DIR) \ + /DGLIB_GTK1_HACK_DIR=$(GLIB_GTK1_HACK_DIR) \ !IFDEF ICONV_DIR /DICONV_DIR=$(ICONV_DIR) \ !ENDIF diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 2116f54db6..caafa64238 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -303,7 +303,6 @@ File "..\..\wiretap\wiretap-${WTAP_VERSION}.dll" File "..\..\epan\libwireshark.dll" !endif File "${GLIB_DIR}\bin\libglib-2.0-0.dll" -File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll" File "${GLIB_DIR}\bin\libgobject-2.0-0.dll" !ifdef ICONV_DIR File "${ICONV_DIR}\bin\iconv.dll" @@ -684,6 +683,7 @@ SectionIn 2 RO !endif SetOutPath $INSTDIR File "..\..\wireshark.exe" +File "${GLIB_GTK1_HACK_DIR}\bin\libgmodule-2.0-0.dll" File "${GTK1_DIR}\lib\libgtk-0.dll" File "${GTK1_DIR}\lib\libgdk-0.dll" SectionEnd @@ -697,6 +697,8 @@ SectionIn 1 RO !endif SetOutPath $INSTDIR File /oname=wireshark.exe "..\..\wireshark-gtk2.exe" +; libgmodule should be moved back to the Required section if we ever drop GTK1 +File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll" File "${GTK2_DIR}\bin\libgdk-win32-2.0-0.dll" File "${GTK2_DIR}\bin\libgdk_pixbuf-2.0-0.dll" File "${GTK2_DIR}\bin\libgtk-win32-2.0-0.dll" |