diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-10-27 12:06:13 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-10-27 12:06:13 +0000 |
| commit | 826b6112902fdf4fe76b9026c16c5fb9237979b8 (patch) | |
| tree | b080cdb38b9d177f5282db80be08fc4a962ee868 /Makefile.nmake | |
| parent | 315327f79d59b63aa9a9c2398a133d5d945dbea7 (diff) | |
| download | wireshark-826b6112902fdf4fe76b9026c16c5fb9237979b8.tar.gz wireshark-826b6112902fdf4fe76b9026c16c5fb9237979b8.tar.bz2 wireshark-826b6112902fdf4fe76b9026c16c5fb9237979b8.zip | |
fix the GTK-WIMP paths for GTK2.8 - both source and destination paths completely changed from 2.6 to 2.8 due to the integration of Wimp into the main GTK repository
remove settings for GTK2.2 and 2.4 in config.nmake - as no one uses it IMHO
svn path=/trunk/; revision=19715
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 4373f68104..fd8c3507e1 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -820,11 +820,11 @@ install-deps2: install-common-deps2 xcopy $(GTK2_DIR)\bin\libcairo-2.dll $(INSTALL2_DIR) /d xcopy $(GTK2_DIR)\bin\libpangocairo-1.0-0.dll $(INSTALL2_DIR) /d !ENDIF - if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines - xcopy "$(GTK_WIMP_DIR)\libwimp.dll" $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines /d -!IF "$(GTK2_INST_VERSION)" != "2.8" - if not exist $(INSTALL2_DIR)\share\themes\Default\gtk-2.0 mkdir $(INSTALL2_DIR)\share\themes\Default\gtk-2.0 - xcopy "$(GTK_WIMP_DIR)\Theme\gtk-2.0\gtkrc" $(INSTALL2_DIR)\share\themes\Default\gtk-2.0 /d +!IFDEF GTK_WIMP_DIR + if not exist $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR) mkdir $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR) + xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR) /d + if not exist $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR) mkdir $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR) + xcopy "$(GTK_WIMP_RCSRC_DIR)\gtkrc" $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR) /d !ENDIF !ENDIF |