diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-09-16 13:34:37 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-09-16 13:34:37 +0000 |
| commit | ef2d9da167024f38e69a2196f565037c74469c74 (patch) | |
| tree | 4c0ad7e583b8535cc3bf610a7dce77065332e905 /Makefile.nmake | |
| parent | 5a2247f5a305782dbdaf1f60f967fae603b8ae56 (diff) | |
Use the latest GTK packages.
svn path=/trunk/; revision=29943
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index f96716dad4..d7e7a789d9 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -834,6 +834,15 @@ process_libs: !ERROR ? Unknown or invalid PANGO_INST_VERSION !ENDIF !ENDIF +# PANGO 1.24.5 needs these DLL:s +!IFDEF NEED_FREETYPE_DLL + @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ + expat gtk$(GTK_INST_VERSION)/expat_$(EXPAT_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip + @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ + fontconfig gtk$(GTK_INST_VERSION)/fontconfig_$(FONTCONFIG_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip + @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ + freetype gtk$(GTK_INST_VERSION)/freetype_$(FREETYPE_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip +!ENDIF !IFDEF HHC_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ user-guide user-guide-28526.zip @@ -1029,6 +1038,16 @@ install-all: install-generated-files xcopy $(GTK_DIR)\bin\libcairo-2.dll $(INSTALL_DIR) /d xcopy $(GTK_DIR)\bin\libpangocairo-1.0-0.dll $(INSTALL_DIR) /d !ENDIF +!IFDEF NEED_FREETYPE_DLL + xcopy $(GTK_DIR)\bin\libpangoft2-1.0-0.dll $(INSTALL_DIR) /d + xcopy $(WIRESHARK_LIBS)\freetype\bin\$(FREETYPE_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_FONTCONFIG_DLL + xcopy $(WIRESHARK_LIBS)\fontconfig\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_EXPAT_DLL + xcopy $(WIRESHARK_LIBS)\expat\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d +!ENDIF if not exist $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) mkdir $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) /d if not exist $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR) mkdir $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR) |