diff options
| author | Gerald Combs <gerald@wireshark.org> | 2004-02-18 20:45:54 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2004-02-18 20:45:54 +0000 |
| commit | 037c2c12e41bee877c2d39dca8e61a7efd48d37a (patch) | |
| tree | a93dfc028d3f748126e69344c27a12a58c5f2fe0 /Makefile.nmake | |
| parent | f121ee94d09de998585687dd63999a13aaad3815 (diff) | |
From Lars Roland: Add support for a combined GTK1/2 Windows installer.
svn path=/trunk/; revision=10098
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index adfffd857b..248014f2b8 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.404 2004/02/13 02:03:14 guy Exp $ +# $Id: Makefile.nmake,v 1.405 2004/02/18 20:45:54 gerald Exp $ include config.nmake include <win32.mak> @@ -153,11 +153,18 @@ all: tools wiretap epan image $(EXECUTABLES) $(RESOURCES) doc packaging: all cd packaging cd nsis + nmake -f makefile.nmake + cd .. + cd .. + +seperate_packaging: all + cd packaging + cd nsis !IFDEF GTK1_DIR - nmake -f makefile.nmake GTK1="USE" + nmake -f makefile.nmake GTK1_ONLY="USE" !ENDIF !IFDEF GTK2_DIR - nmake -f makefile.nmake GTK2="USE" + nmake -f makefile.nmake GTK2_ONLY="USE" !ENDIF cd .. cd .. |