diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-10-27 12:06:13 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-10-27 12:06:13 +0000 |
| commit | c5ad54430e95b062a489e02527d36c4a8f12e235 (patch) | |
| tree | b080cdb38b9d177f5282db80be08fc4a962ee868 /packaging | |
| parent | ddb5935c296d15376eb52eb9ef7e6e12b9f6115d (diff) | |
fix the GTK-WIMP paths for GTK2.8 - both source and destination paths completely changed from 2.6 to 2.8 due to the integration of Wimp into the main GTK repository
remove settings for GTK2.2 and 2.4 in config.nmake - as no one uses it IMHO
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19715 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 5 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 12 | ||||
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 5 |
3 files changed, 10 insertions, 12 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 84f4c40a25..55bd4e76d0 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -124,7 +124,10 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake !ENDIF !IFDEF GTK_WIMP_DIR /DGTK_WIMP_DIR=$(GTK_WIMP_DIR) \ - /DGTK_THEME_DIR=$(GTK_THEME_DIR) \ + /DGTK_WIMP_DLLDST_DIR=$(GTK_WIMP_DLLDST_DIR) \ + /DGTK_WIMP_DLLSRC_DIR=$(GTK_WIMP_DLLSRC_DIR) \ + /DGTK_WIMP_RCDST_DIR=$(GTK_WIMP_RCDST_DIR) \ + /DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \ !ENDIF /DGLIB_DIR=$(GLIB_DIR) \ /DICONV_DIR=$(ICONV_DIR) \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index fac1f8402c..41a8abf44e 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -675,14 +675,10 @@ SectionEnd Section "GTK-Wimp" SecGTKWimp ;------------------------------------------- SectionIn 1 -SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\engines -File "${GTK_WIMP_DIR}\libwimp.dll" -; GTK+ 2.8 looks for themes in "etc". We should really pick one -; directory and install there. -SetOutPath $INSTDIR\share\themes\Default\gtk-2.0 -File "${GTK_THEME_DIR}\gtkrc" -SetOutPath $INSTDIR\etc\gtk-2.0 -File "${GTK_THEME_DIR}\gtkrc" +SetOutPath $INSTDIR\${GTK_WIMP_DLLDST_DIR} +File "${GTK_WIMP_DLLSRC_DIR}\libwimp.dll" +SetOutPath $INSTDIR\${GTK_WIMP_RCDST_DIR} +File "${GTK_WIMP_RCSRC_DIR}\gtkrc" SectionEnd !endif !endif diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index cd3cc95b9d..4f5123f259 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -263,10 +263,9 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe $(COPY) $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders $(COPY) $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules $(COPY) $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(HOST)\lib\pango\$(PANGO_LIB_DIR)\modules - !IFDEF GTK_WIMP_DIR - $(COPY) $(GTK_WIMP_DIR)\libwimp.dll $(HOST) $(COPY_FLAGS) - $(COPY) $(GTK_THEME_DIR)\gtkrc $(HOST)\etc\gtk-2.0 $(COPY_FLAGS) + $(COPY) $(GTK_WIMP_DLLSRC_DIR)\libwimp.dll $(HOST)\$(GTK_WIMP_DLLDST_DIR) $(COPY_FLAGS) + $(COPY) $(GTK_WIMP_RCSRC_DIR)\gtkrc $(HOST)\$(GTK_WIMP_RCDST_DIR) $(COPY_FLAGS) !ENDIF !ELSE !IFDEF GTK1_DIR |