diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-06-20 20:22:09 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-06-20 20:22:09 +0000 |
| commit | 3e66de189517f448a5cc3533d37e3095d47ffd4a (patch) | |
| tree | 536c49968d1a44bcd7ba461b280f7b35fe965a65 | |
| parent | 13280b6e3809e524002396e21bef3935b16594f3 (diff) | |
add GTK2.4 and alike libs to the setup target,
depending on settings in config.nmake
svn path=/trunk/; revision=11200
| -rw-r--r-- | Makefile.nmake | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a3f92eb85f..5cfc5e3273 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.421 2004/06/20 09:49:36 ulfl Exp $ +# $Id: Makefile.nmake,v 1.422 2004/06/20 20:22:09 ulfl Exp $ include config.nmake include <win32.mak> @@ -395,10 +395,17 @@ verify_apps: @$(SH) tools\win32-setup.sh --appverify $(REQUIRED_APPS) setup: verify_apps +!IF "$(GTK2_INST_VERSION)" == "2.4" + @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ + glib gtk2.4/glib-2.4.1.zip + @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ + glib gtk2.4/glib-dev-2.4.1.zip +!ELSE @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ glib glib-2.2.3-20040116.zip @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ glib glib-dev-2.2.3-20040116.zip +!ENDIF !IFDEF GTK1_DIR @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ gtk+ gtk+-1.3.0-20030717.zip @@ -430,19 +437,37 @@ setup: verify_apps zlib121-dll zlib121-dll.zip !ENDIF !IFDEF GTK2_DIR +!IF "$(GTK2_INST_VERSION)" == "2.4" @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ - gtk2 gtk2/gtk+-2.2.4-20040124.zip + gtk2 gtk2.4/gtk+-2.4.1.zip @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ - gtk2 gtk2/gtk+-dev-2.2.4-20040124.zip + gtk2 gtk2.4/gtk+-dev-2.4.1.zip @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ - gtk2 gtk2/pango-1.2.5-20040124.zip + gtk2 gtk2.4/atk-1.6.0.zip @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ - gtk2 gtk2/pango-dev-1.2.5-20040124.zip + gtk2 gtk2.4/atk-dev-1.6.0.zip +!ELSE + @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ + gtk2 gtk2/gtk+-2.2.4-20040124.zip + @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ + gtk2 gtk2/gtk+-dev-2.2.4-20040124.zip @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ gtk2 gtk2/atk-1.4.0.zip @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ gtk2 gtk2/atk-dev-1.4.0.zip !ENDIF +!IF "$(PANGO_INST_VERSION)" == "1.4" + @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ + gtk2 gtk2.4/pango-1.4.0.zip + @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ + gtk2 gtk2.4/pango-dev-1.4.0.zip +!ELSE + @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ + gtk2 gtk2/pango-1.2.5-20040124.zip + @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ + gtk2 gtk2/pango-dev-1.2.5-20040124.zip +!ENDIF +!ENDIF !IFDEF GTK_WIMP_DIR @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ gtk-wimp gtk2/gtk-wimp-0.5.4-bin.zip |