diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-05-14 17:54:47 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-05-14 17:54:47 +0000 |
| commit | 992587c3bfbc2a211bb2b3b6a1151a10839e8f41 (patch) | |
| tree | 1b4b1d93f75dc8c59f37afcf401857c699787589 /Makefile.nmake | |
| parent | 0f1a21aaa9a3b4983b99e523c4f093e4e77267de (diff) | |
| download | wireshark-992587c3bfbc2a211bb2b3b6a1151a10839e8f41.tar.gz | |
Try using an OBS-derived Gtk2 bundle, second try.
svn path=/trunk/; revision=42623
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index e69039d2b5..c5313977b4 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1105,28 +1105,43 @@ install-all: install-generated-files if exist $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d xcopy $(GTK_DIR)\lib\gtk-2.0\modules\libgail.dll $(INSTALL_DIR)\lib\gtk-2.0\modules /d xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines\libpixmap.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines /d -!IFDEF NEED_LIBPNG_DLL - xcopy $(GTK_DIR)\bin\$(PNG_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_LIBTIFF_DLL - xcopy $(GTK_DIR)\bin\$(TIFF_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_LIBJPEG_DLL - xcopy $(GTK_DIR)\bin\$(JPEG_DLL) $(INSTALL_DIR) /d -!ENDIF !IFDEF NEED_CAIRO_DLL 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_EXPAT_DLL + xcopy $(GTK_DIR)\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_FFI_DLL + xcopy $(GTK_DIR)\bin\$(FFI_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_FONTCONFIG_DLL + xcopy $(GTK_DIR)\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d +!ENDIF !IFDEF NEED_FREETYPE_DLL xcopy $(GTK_DIR)\bin\libpangoft2-1.0-0.dll $(INSTALL_DIR) /d xcopy $(GTK_DIR)\bin\$(FREETYPE_DLL) $(INSTALL_DIR) /d !ENDIF -!IFDEF NEED_FONTCONFIG_DLL - xcopy $(GTK_DIR)\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d +!IFDEF NEED_JASPER_DLL + xcopy $(GTK_DIR)\bin\$(JASPER_DLL) $(INSTALL_DIR) /d !ENDIF -!IFDEF NEED_EXPAT_DLL - xcopy $(GTK_DIR)\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d +!IFDEF NEED_JPEG_DLL + xcopy $(GTK_DIR)\bin\$(JPEG_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_LZMA_DLL + xcopy $(GTK_DIR)\bin\$(LZMA_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_PIXMAN_DLL + xcopy $(GTK_DIR)\bin\$(PIXMAN_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_PNG_DLL + xcopy $(GTK_DIR)\bin\$(PNG_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_TIFF_DLL + xcopy $(GTK_DIR)\bin\$(TIFF_DLL) $(INSTALL_DIR) /d +!ENDIF +!IFDEF NEED_XML_DLL + xcopy $(GTK_DIR)\bin\$(XML_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 |