diff options
| -rw-r--r-- | config.nmake | 1 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 6 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index ab4105af48..5fe89cd13d 100644 --- a/config.nmake +++ b/config.nmake @@ -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" diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 290ffd98ea..4956c89c75 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -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) \ diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 1163ba1984..c46a995465 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -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 |