aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2005-12-14 21:19:39 +0000
committerGerald Combs <gerald@wireshark.org>2005-12-14 21:19:39 +0000
commit253b96e81fc9e868f1913c3f834087ef80edc276 (patch)
tree22454b8c71c9aec99d729827ce30da5ce7656c7d /packaging
parent2c7bbf1fb16a4b3c8d93c23353d2ef71834ce33f (diff)
Add support for GLib/GTK+ 2.8. Point to the latest tag.
svn path=/trunk/; revision=16802
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/Makefile.nmake4
-rw-r--r--packaging/nsis/ethereal.nsi17
2 files changed, 12 insertions, 9 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 2b3d120d4a..290ffd98ea 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -116,8 +116,8 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
!ENDIF
!IFDEF GTK2_DIR
/DGTK2_DIR=$(GTK2_DIR) \
- /DGTK2_INST_VERSION=$(GTK2_INST_VERSION) \
- /DPANGO_INST_VERSION=$(PANGO_INST_VERSION) \
+ /DGTK2_LIB_DIR=$(GTK2_LIB_DIR) \
+ /DPANGO_LIB_DIR=$(PANGO_LIB_DIR) \
!ENDIF
!IFDEF GTK_WIMP_DIR
/DGTK_WIMP_DIR=$(GTK_WIMP_DIR) \
diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi
index e9750a41f2..1163ba1984 100644
--- a/packaging/nsis/ethereal.nsi
+++ b/packaging/nsis/ethereal.nsi
@@ -619,23 +619,26 @@ File "${GTK2_DIR}\bin\libgtk-win32-2.0-0.dll"
File "${GTK2_DIR}\bin\libatk-1.0-0.dll"
File "${GTK2_DIR}\bin\libpango-1.0-0.dll"
File "${GTK2_DIR}\bin\libpangowin32-1.0-0.dll"
+!ifdef NEED_LIBPNG_DLL
+File "${GTK2_DIR}\bin\libpng13.dll"
+!endif
SetOutPath $INSTDIR\etc\gtk-2.0
File "${GTK2_DIR}\etc\gtk-2.0\*.*"
SetOutPath $INSTDIR\etc\pango
File "${GTK2_DIR}\etc\pango\pango.*"
-SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_INST_VERSION}.0\loaders
-File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_INST_VERSION}.0\loaders\libpixbufloader-*.dll"
-SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_INST_VERSION}.0\immodules
-File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_INST_VERSION}.0\immodules\im-*.dll"
-SetOutPath $INSTDIR\lib\pango\${PANGO_INST_VERSION}.0\modules
-File "${GTK2_DIR}\lib\pango\${PANGO_INST_VERSION}.0\modules\pango-*.dll"
+SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders
+File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders\libpixbufloader-*.dll"
+SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules
+File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules\im-*.dll"
+SetOutPath $INSTDIR\lib\pango\${PANGO_LIB_DIR}\modules
+File "${GTK2_DIR}\lib\pango\${PANGO_LIB_DIR}\modules\pango-*.dll"
SectionEnd
!ifdef GTK_WIMP_DIR
Section "GTK-Wimp" SecGTKWimp
;-------------------------------------------
SectionIn 1
-SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_INST_VERSION}.0\engines
+SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\engines
File "${GTK_WIMP_DIR}\libwimp.dll"
SetOutPath $INSTDIR\share\themes\Default\gtk-2.0
File "${GTK_WIMP_DIR}\Theme\gtk-2.0\gtkrc"