osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Make sure we install the libpng and cairo DLLs if needed. 

svn path=/trunk/; revision=16809
This commit is contained in:
Gerald Combs 2005-12-15 03:36:17 +00:00
parent 3cb89f382f
commit 0616a4bedb
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.nmake
View File

@ -299,6 +299,7 @@ GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
!IF "$(GTK2_INST_VERSION)" == "2.8"
GTK2_LIB_DIR=2.4.0
NEED_LIBPNG_DLL=USE
NEED_CAIRO_DLL=USE
!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
GTK2_LIB_DIR=2.4.0
!ELSEIF "$(GTK2_INST_VERSION)" == "2.4"

6
packaging/nsis/Makefile.nmake
View File

@ -118,6 +118,12 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
/DGTK2_DIR=$(GTK2_DIR) \
/DGTK2_LIB_DIR=$(GTK2_LIB_DIR) \
/DPANGO_LIB_DIR=$(PANGO_LIB_DIR) \
!IFDEF NEED_LIBPNG_DLL
/DNEED_LIBPNG_DLL=$(NEED_LIBPNG_DLL) \
!ENDIF
!IFDEF NEED_CAIRO_DLL
/DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \
!ENDIF
!ENDIF
!IFDEF GTK_WIMP_DIR
/DGTK_WIMP_DIR=$(GTK_WIMP_DIR) \

4
packaging/nsis/ethereal.nsi
View File

@ -619,6 +619,10 @@ 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_CAIRO_DLL
File "${GTK2_DIR}\bin\libcairo-2.dll"
File "${GTK2_DIR}\bin\libpangocairo-1.0-0.dll"
!endif
!ifdef NEED_LIBPNG_DLL
File "${GTK2_DIR}\bin\libpng13.dll"
!endif